Now that gen7_sampler_state.c is gone, everything is once again in a
single file.
Signed-off-by: Kenneth Graunke <kenn...@whitecape.org>
---
src/mesa/drivers/dri/i965/brw_sampler_state.c | 4 ++--
src/mesa/drivers/dri/i965/brw_state.h | 6 ------
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 9904718..f48e3c9 100644
--- a/src/mesa/drivers/dri/i965/brw_sampler_state.c
+++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c
@@ -120,7 +120,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 ) {
@@ -163,7 +163,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,
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 bf711e3..abead18 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,
- struct gl_sampler_object *sampler,
- int unit,
- uint32_t *sdc_offset);
/* gen6_sf_state.c */
void
--
2.0.2
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
