summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKenneth Graunke <[email protected]>2014-07-26 18:10:53 -0700
committerKenneth Graunke <[email protected]>2014-08-02 05:16:40 -0700
commit3f3e0be666339b7b2377123db1d6f09463c64bbd (patch)
treeee7bb7e55dd591f46414632c23cde56e6eb3b64a
parent2fe2fe1fcea5c41edbbf30b1424ad2ac4ffeef43 (diff)
i965: Make some brw_sampler_state.c functions static again.
Now that gen7_sampler_state.c is gone, everything is once again in a single file. Signed-off-by: Kenneth Graunke <[email protected]> Reviewed-by: Topi Pohjolainen <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_sampler_state.c4
-rw-r--r--src/mesa/drivers/dri/i965/brw_state.h6
2 files changed, 2 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c
index 795865ef183..d03047bb3d6 100644
--- a/src/mesa/drivers/dri/i965/brw_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c
@@ -145,7 +145,7 @@ brw_emit_sampler_state(struct brw_context *brw,
}
}
-uint32_t
+static uint32_t
translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest)
{
switch( wrap ) {
@@ -188,7 +188,7 @@ translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest)
/**
* Upload SAMPLER_BORDER_COLOR_STATE.
*/
-void
+static void
upload_default_color(struct brw_context *brw,
const struct gl_sampler_object *sampler,
int unit,
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 35f3345c0be..abead1807aa 100644
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -261,12 +261,6 @@ void brw_emit_sampler_state(struct brw_context *brw,
unsigned shadow_function,
bool non_normalized_coordinates,
uint32_t border_color_offset);
-uint32_t translate_wrap_mode(struct brw_context *brw,
- GLenum wrap, bool using_nearest);
-void upload_default_color(struct brw_context *brw,
- const struct gl_sampler_object *sampler,
- int unit,
- uint32_t *sdc_offset);
/* gen6_sf_state.c */
void