Commit: 3541f234a28aedaa5efe70c8d3a0e51d625f0ef9
Author: Mike Erwin
Date: Thu Apr 16 17:10:06 2015 -0400
Branches: GPU_data_request
https://developer.blender.org/rB3541f234a28aedaa5efe70c8d3a0e51d625f0ef9
fix compiler warnings (gcc 4.9)
===================================================================
M source/blender/editors/space_view3d/drawobject.c
M source/blender/editors/space_view3d/view3d_draw.c
M source/blender/gpu/GPUx_draw.h
M source/blender/gpu/intern/gpux_element.c
===================================================================
diff --git a/source/blender/editors/space_view3d/drawobject.c
b/source/blender/editors/space_view3d/drawobject.c
index 3bc717a..97ee52e 100644
--- a/source/blender/editors/space_view3d/drawobject.c
+++ b/source/blender/editors/space_view3d/drawobject.c
@@ -1874,9 +1874,9 @@ static void drawcamera(Scene *scene, View3D *v3d,
RegionView3D *rv3d, Base *base
}
}
-/* flag similar to draw_object() */
-static void drawcamera_new(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base
*base,
- const short dflag, const unsigned char
ob_wire_col[4])
+#if 0 /* unused */
+static void drawcamera_new_old(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Base *base,
+ const short dflag, const unsigned char
ob_wire_col[4])
{
#if MCE_TRACE
printf("- %s\n", __FUNCTION__);
@@ -2010,9 +2010,10 @@ static void drawcamera_new(Scene *scene, View3D *v3d,
RegionView3D *rv3d, Base *
}
glDisableClientState(GL_VERTEX_ARRAY);
}
+#endif /* unused */
-static void drawcamera_new_new(Scene *scene, View3D *v3d, RegionView3D *rv3d,
Base *base,
- const short UNUSED(dflag), const unsigned char
UNUSED(ob_wire_col[4]))
+static void drawcamera_new(Scene *scene, View3D *v3d, RegionView3D *rv3d, Base
*base,
+ const short UNUSED(dflag), const unsigned char
UNUSED(ob_wire_col[4]))
{
#if MCE_TRACE
printf("- %s\n", __FUNCTION__);
@@ -4461,12 +4462,12 @@ static bool draw_mesh_object_new_new(Scene *scene,
ARegion *ar, View3D *v3d, Reg
const int face_ct = dm->getNumTessFaces(dm);
const int attrib_ct = (dt > OB_WIRE) ? 2 : 1;
- dm->gpux_batch->draw_type = dt;
-
VertexBuffer *verts =
GPUx_vertex_buffer_create(attrib_ct, vert_ct);
ElementList *elem = NULL;
MVert *mverts = dm->getVertArray(dm);
+ dm->gpux_batch->draw_type = dt;
+
#if MCE_TRACE
printf("%d verts, %d edges, %d faces\n", vert_ct,
edge_ct, face_ct);
#endif /* MCE_TRACE */
@@ -8013,7 +8014,7 @@ static void draw_object_intern(Scene *scene, ARegion *ar,
View3D *v3d, Base *bas
(rv3d->persp == RV3D_CAMOB && v3d->camera
== ob)) /* special exception for active camera */
{
if (new_style_drawing)
- drawcamera_new_new(scene, v3d,
rv3d, base, dflag, ob_wire_col);
+ drawcamera_new(scene, v3d,
rv3d, base, dflag, ob_wire_col);
else
drawcamera(scene, v3d, rv3d,
base, dflag, ob_wire_col);
}
diff --git a/source/blender/editors/space_view3d/view3d_draw.c
b/source/blender/editors/space_view3d/view3d_draw.c
index 75a6b81..f8aade1 100644
--- a/source/blender/editors/space_view3d/view3d_draw.c
+++ b/source/blender/editors/space_view3d/view3d_draw.c
@@ -3718,6 +3718,8 @@ static void view3d_main_area_draw_viewport_new(const
bContext *UNUSED(C), Scene
/* setup view matrices */
view3d_main_area_setup_view(scene, v3d, ar, NULL, NULL);
+ view3d_update_view_dependent_uniforms();
+
/* framebuffer fx needed, we need to draw offscreen first */
if (v3d->fx_settings.fx_flag) {
GPUFXSettings fx_settings;
diff --git a/source/blender/gpu/GPUx_draw.h b/source/blender/gpu/GPUx_draw.h
index e3ccc03..8c2317c 100644
--- a/source/blender/gpu/GPUx_draw.h
+++ b/source/blender/gpu/GPUx_draw.h
@@ -25,7 +25,7 @@ typedef struct GPUxBatch {
ElementList *elem;
} GPUxBatch;
-GPUxBatch *GPUx_batch_create();
+GPUxBatch *GPUx_batch_create(void);
void GPUx_batch_discard(GPUxBatch*);
void GPUx_draw_batch(const GPUxBatch*);
diff --git a/source/blender/gpu/intern/gpux_element.c
b/source/blender/gpu/intern/gpux_element.c
index 12d2689..527e169 100644
--- a/source/blender/gpu/intern/gpux_element.c
+++ b/source/blender/gpu/intern/gpux_element.c
@@ -220,6 +220,8 @@ void GPUx_set_triangle_vertices(ElementList *el, unsigned
prim_idx, unsigned v1,
void GPUx_optimize(ElementList *el)
{
+ (void)el;
+
/* TODO: apply Forsyth's vertex cache algorithm */
/* http://hacksoflife.blogspot.com/2010/01/to-strip-or-not-to-strip.html
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
