From 7cdb0a30faf1c96bacf5cec2d64bb64d7c8ef4a8 Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Wed, 30 Jul 2014 10:50:12 -0700 Subject: [PATCH] i965: Add const to upload_default_color's sampler parameter. It doesn't edit the value, and this lets us use const in more places. Needed to implement Topi's review comments for the next patch. Signed-off-by: Kenneth Graunke --- src/mesa/drivers/dri/i965/brw_sampler_state.c | 2 +- src/mesa/drivers/dri/i965/brw_state.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index a4091a1ec21..5d9f85cc217 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -115,7 +115,7 @@ translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest) */ void upload_default_color(struct brw_context *brw, - struct gl_sampler_object *sampler, + const struct gl_sampler_object *sampler, int unit, uint32_t *sdc_offset) { diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index 0fda360e3c1..6b4092344d0 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -246,7 +246,7 @@ void gen8_init_vtable_surface_functions(struct brw_context *brw); uint32_t translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest); void upload_default_color(struct brw_context *brw, - struct gl_sampler_object *sampler, + const struct gl_sampler_object *sampler, int unit, uint32_t *sdc_offset); -- 2.30.2