i965: Rename brw_wm_sampler_state.c to brw_sampler_state.c.

When the driver was originally written, it only supported texturing in
the pixel shader backend; vertex and geometry shader texturing came much
later.  Originally, the pixel shader was referred to as "WM" (the
Windowizer/Masker unit).  So, this code happened to only be relevant for
the WM stage, at the time.

However, sampler state really applies to all stages, so putting "wm" in
the filename doesn't make sense.  I dropped it in gen7_sampler_state.c;
at this point the asymmetry just trips people up.

Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Topi Pohjolainen <topi.pohjolainen@intel.com>

diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
index e235679..d2ff804 100644 (file)
--- a/src/mesa/drivers/dri/i965/Makefile.sources
+++ b/src/mesa/drivers/dri/i965/Makefile.sources
@@ -86,6 +86,7 @@ i965_FILES = \
        brw_primitive_restart.c \
        brw_queryobj.c \
        brw_reset.c \
+       brw_sampler_state.c \
        brw_schedule_instructions.cpp \
        brw_sf.c \
        brw_sf_emit.c \
@@ -116,7 +117,6 @@ i965_FILES = \
        brw_vs_surface_state.c \
        brw_wm.c \
        brw_wm_iz.cpp \
-       brw_wm_sampler_state.c \
        brw_wm_state.c \
        brw_wm_surface_state.c \
        gen6_blorp.cpp \

diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c
similarity index 100%
rename from src/mesa/drivers/dri/i965/brw_wm_sampler_state.c
rename to src/mesa/drivers/dri/i965/brw_sampler_state.c

diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h
index 6f1db6c..77de785 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_state.h
+++ b/src/mesa/drivers/dri/i965/brw_state.h
@@ -242,7 +242,7 @@ void gen7_upload_3dstate_so_decl_list(struct brw_context *brw,
 /* gen8_surface_state.c */
 void gen8_init_vtable_surface_functions(struct brw_context *brw);
 
-/* brw_wm_sampler_state.c */
+/* brw_sampler_state.c */
 uint32_t translate_wrap_mode(struct brw_context *brw,
                              GLenum wrap, bool using_nearest);
 void upload_default_color(struct brw_context *brw,