[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [60267] branches/soc-2013-viewport_fx/ source/blender: more progress on last refactor before end of GSoC 2013
Jason Wilkins
Jason.A.Wilkins at gmail.com
Fri Sep 20 19:59:26 CEST 2013
Revision: 60267
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=60267
Author: jwilkins
Date: 2013-09-20 17:59:25 +0000 (Fri, 20 Sep 2013)
Log Message:
-----------
more progress on last refactor before end of GSoC 2013
Modified Paths:
--------------
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_font.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal_types.h
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/smoke.c
branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_channels_defines.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/anim_markers.c
branches/soc-2013-viewport_fx/source/blender/editors/animation/keyframes_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/armature_select.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/editarmature_sketch.c
branches/soc-2013-viewport_fx/source/blender/editors/armature/reeb.c
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/drawgpencil.c
branches/soc-2013-viewport_fx/source/blender/editors/gpencil/gpencil_paint.c
branches/soc-2013-viewport_fx/source/blender/editors/include/BIF_glutil.h
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_icons.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_ops.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_panel.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_regions.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/interface_widgets.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/resources.c
branches/soc-2013-viewport_fx/source/blender/editors/interface/view2d.c
branches/soc-2013-viewport_fx/source/blender/editors/mask/mask_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editface.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_knife.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_loopcut.c
branches/soc-2013-viewport_fx/source/blender/editors/mesh/editmesh_select.c
branches/soc-2013-viewport_fx/source/blender/editors/physics/particle_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/render/render_internal.c
branches/soc-2013-viewport_fx/source/blender/editors/render/render_opengl.c
branches/soc-2013-viewport_fx/source/blender/editors/render/render_preview.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/area.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/glutil.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screen_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/screen/screendump.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_cursor.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_image_proj.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_stroke.c
branches/soc-2013-viewport_fx/source/blender/editors/sculpt_paint/paint_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_action/space_action.c
branches/soc-2013-viewport_fx/source/blender/editors/space_buttons/space_buttons.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_dopesheet_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_editor.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/clip_utils.c
branches/soc-2013-viewport_fx/source/blender/editors/space_clip/space_clip.c
branches/soc-2013-viewport_fx/source/blender/editors/space_console/space_console.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/file_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/space_file.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/space_graph.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/image_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/space_image.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/info_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/space_info.c
branches/soc-2013-viewport_fx/source/blender/editors/space_logic/space_logic.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/nla_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/space_nla.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/drawnode.c
branches/soc-2013-viewport_fx/source/blender/editors/space_node/node_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/outliner_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_outliner/space_outliner.c
branches/soc-2013-viewport_fx/source/blender/editors/space_script/space_script.c
branches/soc-2013-viewport_fx/source/blender/editors/space_sequencer/sequencer_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_text/space_text.c
branches/soc-2013-viewport_fx/source/blender/editors/space_text/text_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_time/space_time.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawanimviz.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawarmature.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawmesh.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawobject.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/drawvolume.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/space_view3d.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_edit.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_fly.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_project.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_ruler.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_select.c
branches/soc-2013-viewport_fx/source/blender/editors/space_view3d/view3d_view.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_constraints.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_snap.c
branches/soc-2013-viewport_fx/source/blender/editors/util/ed_util.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_smart_stitch.c
branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_aspect.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_basic.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_blender_aspect.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_common.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_deprecated.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_glew.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_init_exit.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_matrix.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_pixels.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_primitives.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_raster.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_utility.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_blender_aspect_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_buffers.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_codegen.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_common.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_debug.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_font.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_font_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_init_exit.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_material.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_matrix.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_primitives_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_profile.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_raster.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_raster_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_safety.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_select.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_sprite.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c
branches/soc-2013-viewport_fx/source/blender/makesrna/intern/rna_image_api.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_dragdrop.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_draw.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_operators.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_playanim.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_subwindow.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_window.c
Added Paths:
-----------
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_immediate.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_select.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_intern.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_utility.c
Removed Paths:
-------------
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_compatibility.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_select.h
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -50,7 +50,9 @@
#include "blf_internal_types.h"
#include "blf_internal.h"
-#include "GPU_compatibility.h"
+#include "GPU_blender_aspect.h"
+#include "GPU_immediate.h"
+#include "GPU_matrix.h"
/* Max number of font in memory.
* Take care that now every font have a glyph cache per size/dpi,
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_font.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_font.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_font.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -57,7 +57,8 @@
#include "blf_internal_types.h"
#include "blf_internal.h"
-#include "GPU_compatibility.h"
+#include "GPU_immediate.h"
+#include "GPU_state_latch.h"
#ifdef __GNUC__
# pragma GCC diagnostic error "-Wsign-conversion"
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_glyph.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -54,7 +54,8 @@
#include "blf_internal_types.h"
#include "blf_internal.h"
-#include "GPU_compatibility.h"
+#include "GPU_state_latch.h"
+#include "GPU_immediate.h"
#ifdef __GNUC__
# pragma GCC diagnostic error "-Wsign-conversion"
Modified: branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal_types.h
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal_types.h 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf_internal_types.h 2013-09-20 17:59:25 UTC (rev 60267)
@@ -31,7 +31,7 @@
#ifndef __BLF_INTERNAL_TYPES_H__
#define __BLF_INTERNAL_TYPES_H__
-#include "GPU_compatibility.h"
+#include "GPU_glew.h"
typedef struct GlyphCacheBLF {
struct GlyphCacheBLF *next;
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/DerivedMesh.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -80,7 +80,7 @@
#include "GPU_draw.h"
#include "GPU_extensions.h"
#include "GPU_material.h"
-#include "GPU_compatibility.h"
+#include "GPU_glew.h"
static void add_shapekey_layers(DerivedMesh *dm, Mesh *me, Object *ob);
static void shapekey_layers_to_keyblocks(DerivedMesh *dm, Mesh *me, int actshape_uid);
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -63,12 +63,15 @@
#include "MEM_guardedalloc.h"
+#include "GPU_basic.h"
+#include "GPU_blender_aspect.h"
#include "GPU_buffers.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
+#include "GPU_immediate.h"
#include "GPU_material.h"
-#include "GPU_compatibility.h"
-#include "GPU_basic_shader.h"
+#include "GPU_matrix.h"
+#include "GPU_raster.h"
/* standard */
#include <string.h>
@@ -77,8 +80,6 @@
-extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
-
typedef struct {
DerivedMesh dm;
@@ -351,8 +352,7 @@
else { /* use OpenGL VBOs or Vertex Arrays instead for better, faster rendering */
GPU_vertex_setup(dm);
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal interface
+ GPU_commit_aspect();
if (!GPU_buffer_legacy(dm)) {
if (dm->drawObject->tot_triangle_point)
@@ -405,8 +405,7 @@
GPU_uvedge_setup(dm);
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal interface
+ GPU_commit_aspect();
if (!GPU_buffer_legacy(dm)) {
for (i = 0; i < dm->numTessFaceData; i++, mf++) {
@@ -895,8 +894,7 @@
else
GPU_color_switch(0);
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal interface
+ GPU_commit_aspect();
glDrawArrays(GL_TRIANGLES, first, count);
}
@@ -1014,7 +1012,7 @@
GPU_aspect_enable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
- gpuPolygonStipple(stipple_quarttone);
+ gpuPolygonStipple(GPU_stipple_quarttone);
}
else {
// SSS Enable Smooth
@@ -1111,8 +1109,7 @@
if (setDrawOptions == NULL) {
/* just draw the entire face array */
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal function call
+ GPU_commit_aspect();
glDrawArrays(GL_TRIANGLES, 0, (tottri) * 3);
}
@@ -1143,7 +1140,7 @@
GPU_aspect_enable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
- gpuPolygonStipple(stipple_quarttone);
+ gpuPolygonStipple(GPU_stipple_quarttone);
}
/* Goal is to draw as long of a contiguous triangle
@@ -1167,7 +1164,7 @@
if (count)
{
- gpu_commit_matrixes(); // XXX jwilkins: internal function call
+ GPU_commit_aspect();
glDrawArrays(GL_TRIANGLES, first, count);
}
@@ -1453,8 +1450,7 @@
GPU_normal_setup(dm);
if (!GPU_buffer_legacy(dm)) {
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal function call
+ GPU_commit_aspect();
for (i = 0; i < dm->drawObject->tot_triangle_point / 3; i++) {
@@ -1636,8 +1632,7 @@
GPU_interleaved_attrib_setup(buffer, datatypes, numdata);
}
- gpu_commit_aspect(); // XXX jwilkins: internal interface
- gpu_commit_matrixes(); // XXX jwilkins: internal function call
+ GPU_commit_aspect();
glDrawArrays(GL_TRIANGLES, start * 3, (curface - start) * 3);
}
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -61,14 +61,13 @@
#include "MEM_guardedalloc.h"
+#include "GPU_basic.h"
+#include "GPU_blender_aspect.h"
#include "GPU_extensions.h"
-#include "GPU_compatibility.h"
-#include "GPU_basic_shader.h"
+#include "GPU_immediate.h"
+#include "GPU_lighting.h"
+#include "GPU_raster.h"
-
-
-extern GLubyte stipple_quarttone[128]; /* glutil.c, bad level data */
-
static void bmdm_get_tri_colpreview(BMLoop *ls[3], MLoopCol *lcol[3], unsigned char(*color_vert_array)[4]);
typedef struct EditDerivedBMesh {
@@ -329,7 +328,7 @@
const int lasttri = tottri - 1; /* compare agasint this a lot */
DMDrawOption draw_option;
int i, flush;
- const int useNormals = (flag & DM_DRAW_USE_NORMALS) && GPU_basic_shader_needs_normals(); /* could be passed as an arg */
+ const int useNormals = (flag & DM_DRAW_USE_NORMALS) && GPU_basic_needs_normals(); /* could be passed as an arg */
MLoopCol *lcol[3] = {NULL} /* , dummylcol = {0} */;
unsigned char(*color_vert_array)[4] = em->derivedVertColor;
@@ -393,7 +392,7 @@
GPU_aspect_enable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
- gpuPolygonStipple(stipple_quarttone);
+ gpuPolygonStipple(GPU_stipple_quarttone);
}
if (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
@@ -497,7 +496,7 @@
GPU_aspect_enable(GPU_ASPECT_RASTER, GPU_RASTER_POLYGON|GPU_RASTER_STIPPLE);
- gpuPolygonStipple(stipple_quarttone);
+ gpuPolygonStipple(GPU_stipple_quarttone);
}
if (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -1537,7 +1537,7 @@
}
#if 0
-#include "GPU_compatibility.h"
+#include "GPU_glew.h"
#endif
typedef struct {
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/smoke.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/smoke.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/smoke.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -83,7 +83,7 @@
#include "BKE_scene.h"
#include "BKE_smoke.h"
-#include "GPU_compatibility.h"
+#include "GPU_glew.h"
#include "RE_shader_ext.h"
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c 2013-09-20 14:48:47 UTC (rev 60266)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c 2013-09-20 17:59:25 UTC (rev 60267)
@@ -70,12 +70,14 @@
# include "BLI_array.h"
#endif
-#include "GPU_compatibility.h"
+#include "GPU_basic.h"
+#include "GPU_blender_aspect.h"
#include "GPU_colors.h"
#include "GPU_draw.h"
#include "GPU_extensions.h"
+#include "GPU_immediate.h"
#include "GPU_material.h"
-#include "GPU_basic_shader.h"
+#include "GPU_raster.h"
#include "CCGSubSurf.h"
@@ -87,8 +89,6 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list