From 71775afe6e700b7240240657d8bd2ad761b610cd Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 22 Apr 2016 14:51:05 -0700 Subject: [PATCH] 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 Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/gen6_blorp.cpp | 4 ++-- src/mesa/drivers/dri/i965/gen7_blorp.cpp | 2 +- src/mesa/drivers/dri/i965/gen8_blorp.cpp | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/mesa/drivers/dri/i965/gen6_blorp.cpp b/src/mesa/drivers/dri/i965/gen6_blorp.cpp index 5498070c31d..ee3276ee460 100644 --- 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 f2ed4736856..e2e6072410c 100644 --- 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 d02a003abf5..720f5244ca2 100644 --- 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 = ¶ms->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 || -- 2.30.2