diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-07-26 01:26:54 -0700 |
|---|---|---|
| committer | Kenneth Graunke <kenneth@whitecape.org> | 2014-08-02 05:14:42 -0700 |
| commit | 3f67fb4dc30ed662ffe23c1b8f64a25daec67cdc (patch) | |
| tree | 0baa9af0d5c9e26a960811638123cf5d4b7b460d | |
| parent | 6e120358340870795c22c42bd7dd7953b59f8296 (diff) | |
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>
| -rw-r--r-- | src/mesa/drivers/dri/i965/Makefile.sources | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sampler_state.c (renamed from src/mesa/drivers/dri/i965/brw_wm_sampler_state.c) | 0 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 2 |
3 files changed, 2 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources index e2356795e3a..d2ff804f6d1 100644 --- 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 index 8a4bfead550..8a4bfead550 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/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 6f1db6c1071..77de7851841 100644 --- 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, |