[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58899] branches/soc-2013-viewport_fx/ source/blender: Committing since GPU module compiles again.
Jason Wilkins
Jason.A.Wilkins at gmail.com
Sun Aug 4 12:04:29 CEST 2013
Revision: 58899
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58899
Author: jwilkins
Date: 2013-08-04 10:04:28 +0000 (Sun, 04 Aug 2013)
Log Message:
-----------
Committing since GPU module compiles again. I've made too many changes without being able to compile and test. Concentrating now on bringing things back into a testable state.
Modified Paths:
--------------
branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.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/subsurf_ccg.c
branches/soc-2013-viewport_fx/source/blender/blenlib/BLI_utildefines.h
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/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/UI_resources.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_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/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/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/space_action/action_draw.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_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_console/console_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_file/file_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_graph/graph_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_image/image_draw.c
branches/soc-2013-viewport_fx/source/blender/editors/space_info/textview.c
branches/soc-2013-viewport_fx/source/blender/editors/space_nla/nla_draw.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_sequencer/sequencer_draw.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/view3d_draw.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_ruler.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform.c
branches/soc-2013-viewport_fx/source/blender/editors/transform/transform_manipulator.c
branches/soc-2013-viewport_fx/source/blender/editors/uvedit/uvedit_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/CMakeLists.txt
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_buffers.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_compatibility.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_draw.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_material.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_matrix.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_object.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspectfuncs.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspectfuncs.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_codegen.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_draw.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extension_wrapper.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extension_wrapper.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_extensions.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_glew.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting.h
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.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.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_select.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.h
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_files.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_gesture.c
branches/soc-2013-viewport_fx/source/blender/windowmanager/intern/wm_init_exit.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
Added Paths:
-----------
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_basic_shader.h
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_font_shader.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_basic_shader.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_common.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_common.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_font_shader.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl.h
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_basic_frag.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_basic_vert.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_common_attribs.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_common_constants.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_common_uniforms.glsl
Removed Paths:
-------------
branches/soc-2013-viewport_fx/source/blender/gpu/GPU_simple_shader.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_glsl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_internal.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_immediate_vbo.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_known.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_known.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_glsl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_inline.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_lighting_internal.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gl11.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gles.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_object_gles.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_simple_shader.c
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_known_attribs.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_known_constants.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_known_uniforms.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_simple_frag.glsl
branches/soc-2013-viewport_fx/source/blender/gpu/shaders/gpu_shader_simple_vert.glsl
Property Changed:
----------------
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspect.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspectfuncs.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_aspectfuncs.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_pixels.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.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_select.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_state_latch.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view.h
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.c
branches/soc-2013-viewport_fx/source/blender/gpu/intern/gpu_view_gl.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-08-04 07:16:43 UTC (rev 58898)
+++ branches/soc-2013-viewport_fx/source/blender/blenfont/intern/blf.c 2013-08-04 10:04:28 UTC (rev 58899)
@@ -502,7 +502,7 @@
}
if (font->locked == 0) {
- gpuAspectBegin(GPU_ASPECT_FONT, NULL);
+ GPU_aspect_begin(GPU_ASPECT_FONT, NULL);
if (font->shadow || font->blur) {
gpuImmediateFormat_T2_C4_V2(); // DOODLE: blurred and/or shadowed text
@@ -545,7 +545,7 @@
gpuImmediateUnformat();
- gpuAspectEnd(GPU_ASPECT_FONT, NULL);
+ GPU_aspect_end(GPU_ASPECT_FONT, NULL);
}
}
@@ -595,7 +595,7 @@
gpuRotateAxis(RAD2DEGF(font->angle), 'Z');
if (font->shadow || font->blur)
- gpuGetCurrentColor4fv(font->orig_col);
+ gpuGetColor4fv(font->orig_col);
/* always bind the texture for the first glyph */
font->tex_bind_state = -1;
@@ -616,7 +616,7 @@
/* XXX: current color becomes undefined due to use of vertex arrays,
but a lot of code relies on it remaining the same */
if (font->shadow || font->blur)
- gpuCurrentColor4fv(font->orig_col);
+ gpuColor4fv(font->orig_col);
}
void BLF_draw(int fontid, const char *str, size_t len)
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-04 07:16:43 UTC (rev 58898)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/cdderivedmesh.c 2013-08-04 10:04:28 UTC (rev 58899)
@@ -590,11 +590,11 @@
drawCurrentMat = setMaterial(matnr = new_matnr, NULL);
if (shademodel != -1)
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
shademodel = new_shademodel;
options = shademodel == GL_SMOOTH ? 0 : GPU_SHADER_FLAT_SHADED;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
gpuBegin(glmode = new_glmode);
}
@@ -628,7 +628,7 @@
}
if (dm->numTessFaceData > 0)
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
gpuEnd();
gpuImmediateUnformat();
@@ -638,14 +638,14 @@
GPU_normal_setup(dm);
if (!GPU_buffer_legacy(dm)) {
uint32_t options = 0;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
for (a = 0; a < dm->drawObject->totmaterial; a++) {
if (setMaterial(dm->drawObject->materials[a].mat_nr + 1, NULL)) {
glDrawArrays(GL_TRIANGLES, dm->drawObject->materials[a].start,
dm->drawObject->materials[a].totpoint);
}
}
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
}
GPU_buffer_unbind();
}
@@ -706,7 +706,7 @@
cdDM_update_normals_from_pbvh(dm);
options = GPU_SHADER_TEXTURE_2D|GPU_SHADER_FLAT_SHADED; // XXX jwilkins: not sure if in this context thingsa re suppose dto be flat shaded or not.
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
if (GPU_buffer_legacy(dm)) {
DEBUG_VBO("Using legacy code. cdDM_drawFacesTex_common\n");
@@ -755,7 +755,7 @@
if (!(mf->flag & ME_SMOOTH)) {
if (nors) {
- gpuCurrentNormal3fv(nors);
+ gpuNormal3fv(nors);
}
else {
float nor[3];
@@ -765,7 +765,8 @@
else {
normal_tri_v3(nor, mv[mf->v1].co, mv[mf->v2].co, mv[mf->v3].co);
}
- gpuCurrentNormal3fv(nor);
+
+ gpuNormal3fv(nor);
}
}
@@ -814,9 +815,9 @@
int tottri = dm->drawObject->tot_triangle_point / 3;
int next_actualFace = dm->drawObject->triangle_to_mface[0];
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_FLAT);
options = GPU_SHADER_TEXTURE_2D;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); // gpuShadeModel(GL_SMOOTH);
/* lastFlag = 0; */ /* UNUSED */
for (i = 0; i < tottri; i++) {
@@ -876,7 +877,7 @@
}
}
- gpuAspectEnd(GPU_ASPECT_TEXTURE, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_TEXTURE, SET_UINT_IN_POINTER(options));
GPU_buffer_unbind();
}
@@ -1201,9 +1202,11 @@
if (texco) {
static const GLenum texmap[1] = { GL_TEXTURE0 };
- gpuImmediateTextureUnitCount(1);
- gpuImmediateTextureUnitMap(texmap);
+ gpuImmediateTexCoordCount(1);
gpuImmediateTexCoordSizes(texSize);
+
+ gpuImmediateTextureSamplerCount(1);
+ gpuImmediateTextureSamplerMap(texmap);
}
gpuImmediateFloatAttribCount(attrib_f);
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c 2013-08-04 07:16:43 UTC (rev 58898)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/editderivedmesh.c 2013-08-04 10:04:28 UTC (rev 58899)
@@ -383,7 +383,7 @@
}
if (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
- else if (has_fcol_preview) gpuCurrentColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
+ else if (has_fcol_preview) gpuColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
if (!useNormals) {
if (poly_type != poly_prev) {
@@ -472,7 +472,7 @@
}
if (has_vcol_preview) bmdm_get_tri_colpreview(ltri, lcol, color_vert_array);
- else if (has_fcol_preview) gpuCurrentColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
+ else if (has_fcol_preview) gpuColor3ubv((const GLubyte *)&(color_face_array[BM_elem_index_get(efa)]));
if (!useNormals) {
@@ -600,7 +600,7 @@
BM_mesh_elem_index_ensure(bm, BM_FACE);
- gpuAspectBegin(GPU_ASPECT_TEXTURE, NULL);
+ GPU_aspect_begin(GPU_ASPECT_TEXTURE, NULL);
gpuImmediateFormat_T2_C4_N3_V3();
@@ -746,7 +746,7 @@
gpuImmediateUnformat();
- gpuAspectEnd(GPU_ASPECT_TEXTURE, NULL);
+ GPU_aspect_end(GPU_ASPECT_TEXTURE, NULL);
gpuShadeModel(GL_FLAT);
}
Modified: branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c
===================================================================
--- branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c 2013-08-04 07:16:43 UTC (rev 58898)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/pbvh.c 2013-08-04 10:04:28 UTC (rev 58899)
@@ -1563,7 +1563,7 @@
}
gpuMaterialfv(GL_FRONT_AND_BACK, GL_DIFFUSE, col);
- gpuCurrentColor3f(1, 0, 0);
+ gpuColor3f(1, 0, 0);
#endif
if (!(node->flag & PBVH_FullyHidden)) {
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-08-04 07:16:43 UTC (rev 58898)
+++ branches/soc-2013-viewport_fx/source/blender/blenkernel/intern/subsurf_ccg.c 2013-08-04 10:04:28 UTC (rev 58899)
@@ -1642,7 +1642,7 @@
if (useAging && !(G.f & G_BACKBUFSEL)) {
int ageCol = 255 - ccgSubSurf_getEdgeAge(ss, e) * 4;
- gpuCurrentColor3ub(0, ageCol > 0 ? ageCol : 0, 0);
+ gpuColor3ub(0, ageCol > 0 ? ageCol : 0, 0);
}
gpuBegin(GL_LINE_STRIP);
@@ -1654,7 +1654,7 @@
}
if (useAging && !(G.f & G_BACKBUFSEL)) {
- gpuCurrentColor3x(CPACK_BLACK);
+ gpuColor3P(CPACK_BLACK);
}
if (ccgdm->drawInteriorEdges) {
@@ -1777,11 +1777,11 @@
if (shademodel != new_shademodel) {
if (shademodel != -1)
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
shademodel = new_shademodel;
options = shademodel == GL_FLAT ? GPU_SHADER_FLAT_SHADED : 0;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
}
if (matnr != new_matnr) {
@@ -1834,7 +1834,7 @@
}
if (numVerts > 0)
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
}
gpuEnd();
@@ -1980,7 +1980,7 @@
}
options = drawSmooth ? 0 : GPU_SHADER_FLAT_SHADED;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); //gpuShadeModel(drawSmooth ? GL_SMOOTH : GL_FLAT);
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); //gpuShadeModel(drawSmooth ? GL_SMOOTH : GL_FLAT);
for (S = 0; S < numVerts; S++) {
CCGElem *faceGridData = (CCGElem*)ccgSubSurf_getFaceGridDataArray(ss, f, S);
@@ -2048,7 +2048,7 @@
}
}
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
ccg_unformat_attrib_vertex();
}
@@ -2145,7 +2145,7 @@
/* draw face*/
options = drawSmooth ? 0 : GPU_SHADER_FLAT_SHADED;
- gpuAspectBegin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); //gpuShadeModel(drawSmooth ? GL_SMOOTH : GL_FLAT);
+ GPU_aspect_begin(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options)); //gpuShadeModel(drawSmooth ? GL_SMOOTH : GL_FLAT);
for (S = 0; S < numVerts; S++) {
CCGElem *faceGridData = (CCGElem*)ccgSubSurf_getFaceGridDataArray(ss, f, S);
@@ -2213,7 +2213,7 @@
}
}
- gpuAspectEnd(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
+ GPU_aspect_end(GPU_ASPECT_SIMPLE_SHADER, SET_UINT_IN_POINTER(options));
}
#undef PASSATTRIB
@@ -2248,7 +2248,7 @@
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list