i965/blorp: Make state setup C-safe

Previously they (very rarely) used C++isms that prevented them from being
compiled as C.  As of this commit, they can be compiled as either C or C++.

Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>
Reviewed-by: Matt Turner <mattst88@gmail.com>

diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
index 5498070c31de6957c34d7d05396cd2d0b6abb99b..ee3276ee46007ea48e4adb6e5ed4c6c1e62a5d45 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen6_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen6_blorp.cpp
@@ -693,7 +693,7 @@ gen6_blorp_emit_constant_ps(struct brw_context *brw,
    /* Make sure the push constants fill an exact integer number of
     * registers.
     */
-   assert(sizeof(brw_blorp_wm_push_constants) % 32 == 0);
+   assert(sizeof(struct brw_blorp_wm_push_constants) % 32 == 0);
 
    /* There must be at least one register worth of push constant data. */
    assert(BRW_BLORP_NUM_PUSH_CONST_REGS > 0);
@@ -922,7 +922,7 @@ gen6_blorp_emit_drawing_rectangle(struct brw_context *brw,
 }
 
 /* 3DSTATE_VIEWPORT_STATE_POINTERS */
-void
+static void
 gen6_blorp_emit_viewport_state(struct brw_context *brw,
                               const struct brw_blorp_params *params)
 {

diff --git a/src/mesa/drivers/dri/i965/gen7_blorp.cpp b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
index f2ed47368564873aa5bb2e5c1f9af87ad7f93d71..e2e6072410cc9990ebf7043ce3e336b0c2f5c41b 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen7_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen7_blorp.cpp
@@ -597,7 +597,7 @@ gen7_blorp_emit_constant_ps(struct brw_context *brw,
    /* Make sure the push constants fill an exact integer number of
     * registers.
     */
-   assert(sizeof(brw_blorp_wm_push_constants) % 32 == 0);
+   assert(sizeof(struct brw_blorp_wm_push_constants) % 32 == 0);
 
    /* There must be at least one register worth of push constant data. */
    assert(BRW_BLORP_NUM_PUSH_CONST_REGS > 0);

diff --git a/src/mesa/drivers/dri/i965/gen8_blorp.cpp b/src/mesa/drivers/dri/i965/gen8_blorp.cpp
index d02a003abf58ea5fceb60f1308396ab24377e7de..720f5244ca2f7b89ce55057fe6e6b266eafceb52 100644 (file)
--- a/src/mesa/drivers/dri/i965/gen8_blorp.cpp
+++ b/src/mesa/drivers/dri/i965/gen8_blorp.cpp
@@ -599,7 +599,7 @@ gen8_blorp_emit_surface_states(struct brw_context *brw,
                                     true /* is_render_target */);
    if (params->src.mt) {
       const struct brw_blorp_surface_info *surface = &params->src;
-      intel_mipmap_tree *mt = surface->mt;
+      struct intel_mipmap_tree *mt = surface->mt;
 
       /* Textures are always sampled as 2D. */
       const bool is_cube = mt->target == GL_TEXTURE_CUBE_MAP_ARRAY ||