aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Engestrom <[email protected]>2019-06-22 18:02:52 +0100
committerEric Engestrom <[email protected]>2019-07-31 09:41:05 +0100
commite775b938b25fb78129963f8323181997c265bc42 (patch)
tree59eb3f6e035f3d2b34f791595ca67efc02bca198 /src/mesa/drivers/dri
parent14be04fb2bc1a84d66db7060e370adc49f569a2d (diff)
intel: drop incorrect MAYBE_UNUSED
All these are actually always used. Signed-off-by: Eric Engestrom <[email protected]> Reviewed-by: Matt Turner <[email protected]>
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/genX_state_upload.c4
-rw-r--r--src/mesa/drivers/dri/i965/intel_mipmap_tree.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/src/mesa/drivers/dri/i965/genX_state_upload.c b/src/mesa/drivers/dri/i965/genX_state_upload.c
index ddb418201d5..035fbb5073a 100644
--- a/src/mesa/drivers/dri/i965/genX_state_upload.c
+++ b/src/mesa/drivers/dri/i965/genX_state_upload.c
@@ -74,7 +74,7 @@ KSP(UNUSED struct brw_context *brw, uint32_t offset)
#endif
#if GEN_GEN >= 7
-MAYBE_UNUSED static void
+static void
emit_lrm(struct brw_context *brw, uint32_t reg, struct brw_address addr)
{
brw_batch_emit(brw, GENX(MI_LOAD_REGISTER_MEM), lrm) {
@@ -4941,7 +4941,7 @@ has_component(mesa_format format, int i)
static void
genX(upload_default_color)(struct brw_context *brw,
const struct gl_sampler_object *sampler,
- MAYBE_UNUSED mesa_format format, GLenum base_format,
+ mesa_format format, GLenum base_format,
bool is_integer_format, bool is_stencil_sampling,
uint32_t *sdc_offset)
{
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index e28ac562a15..5716c7f254c 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1577,7 +1577,7 @@ intel_miptree_alloc_aux(struct brw_context *brw,
enum isl_aux_state initial_state;
uint8_t memset_value;
struct isl_surf aux_surf;
- MAYBE_UNUSED bool aux_surf_ok = false;
+ bool aux_surf_ok = false;
switch (mt->aux_usage) {
case ISL_AUX_USAGE_NONE:
@@ -2963,7 +2963,7 @@ intel_miptree_unmap_tiled_memcpy(struct brw_context *brw,
*
* \return true if the format and type combination are valid
*/
-MAYBE_UNUSED isl_memcpy_type
+isl_memcpy_type
intel_miptree_get_memcpy_type(mesa_format tiledFormat, GLenum format, GLenum type,
uint32_t *cpp)
{