diff options
| author | Kenneth Graunke <kenneth@whitecape.org> | 2014-05-28 23:37:44 -0700 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-06-06 18:12:20 -0700 |
| commit | c62bc58ccedc3393433d501fec0fb30c778fd1fa (patch) | |
| tree | d6f4aacb28034a848a6dd194b22515ffd39becd0 | |
| parent | 304e80e35619c473497998ea83ae2fe3f22d3876 (diff) | |
i965: Pass brw to translate_wrap_mode().
This lets us do generation checks.
Signed-off-by: Kenneth Graunke <kenneth@whitecape.org>
Reviewed-by: Matt Turner <mattst88@gmail.com>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 7f3d64a77b9ca6d738f67c7a3dd4499cdf817d79)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_state.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm_sampler_state.c | 8 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/gen7_sampler_state.c | 6 |
3 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index dbcf7c7cf87..c52a977623c 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -243,7 +243,8 @@ void gen7_upload_3dstate_so_decl_list(struct brw_context *brw, void gen8_init_vtable_surface_functions(struct brw_context *brw); /* brw_wm_sampler_state.c */ -uint32_t translate_wrap_mode(GLenum wrap, bool using_nearest); +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, diff --git a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c index bbfd9e053d8..6f8dde4a29b 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_sampler_state.c @@ -46,7 +46,7 @@ uint32_t -translate_wrap_mode(GLenum wrap, bool using_nearest) +translate_wrap_mode(struct brw_context *brw, GLenum wrap, bool using_nearest) { switch( wrap ) { case GL_REPEAT: @@ -276,11 +276,11 @@ static void brw_update_sampler_state(struct brw_context *brw, } } - sampler->ss1.r_wrap_mode = translate_wrap_mode(gl_sampler->WrapR, + sampler->ss1.r_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapR, using_nearest); - sampler->ss1.s_wrap_mode = translate_wrap_mode(gl_sampler->WrapS, + sampler->ss1.s_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapS, using_nearest); - sampler->ss1.t_wrap_mode = translate_wrap_mode(gl_sampler->WrapT, + sampler->ss1.t_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapT, using_nearest); if (brw->gen >= 6 && diff --git a/src/mesa/drivers/dri/i965/gen7_sampler_state.c b/src/mesa/drivers/dri/i965/gen7_sampler_state.c index 74d5e9e0a7e..6077ff20230 100644 --- a/src/mesa/drivers/dri/i965/gen7_sampler_state.c +++ b/src/mesa/drivers/dri/i965/gen7_sampler_state.c @@ -103,11 +103,11 @@ gen7_update_sampler_state(struct brw_context *brw, int unit, int ss_index, } } - sampler->ss3.r_wrap_mode = translate_wrap_mode(gl_sampler->WrapR, + sampler->ss3.r_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapR, using_nearest); - sampler->ss3.s_wrap_mode = translate_wrap_mode(gl_sampler->WrapS, + sampler->ss3.s_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapS, using_nearest); - sampler->ss3.t_wrap_mode = translate_wrap_mode(gl_sampler->WrapT, + sampler->ss3.t_wrap_mode = translate_wrap_mode(brw, gl_sampler->WrapT, using_nearest); /* Cube-maps on 965 and later must use the same wrap mode for all 3 |