diff options
| author | Jason Ekstrand <[email protected]> | 2017-02-06 19:46:22 -0800 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-02-23 19:34:58 +0000 |
| commit | bcd58a918b3e32639c378f99c47f40ed21ee2b51 (patch) | |
| tree | 941a0b605d9147c3a9166d8ebc33ed1aea6d65bc /src/mesa | |
| parent | d5859cbcc07d9ec8c728ecc95864a8978fdec23a (diff) | |
i965/sampler_state: Pass texObj into update_sampler_state
Reviewed-by: Lionel Landwerlin <[email protected]>
Reviewed-by: Kenneth Graunke <[email protected]>
Cc: "17.0 13.0" <[email protected]>
(cherry picked from commit c4f8f395b291a88eb74b07b90a4028ef4f026f58)
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_sampler_state.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_sampler_state.c b/src/mesa/drivers/dri/i965/brw_sampler_state.c index e677a75386d..1cf10a8e385 100644 --- a/src/mesa/drivers/dri/i965/brw_sampler_state.c +++ b/src/mesa/drivers/dri/i965/brw_sampler_state.c @@ -393,8 +393,7 @@ brw_update_sampler_state(struct brw_context *brw, GLenum target, bool tex_cube_map_seamless, GLfloat tex_unit_lod_bias, mesa_format format, GLenum base_format, - bool is_integer_format, - bool is_stencil_sampling, + const struct gl_texture_object *texObj, const struct gl_sampler_object *sampler, uint32_t *sampler_state, uint32_t batch_offset_for_sampler_state) @@ -477,7 +476,7 @@ brw_update_sampler_state(struct brw_context *brw, * integer formats. Fall back to CLAMP for now. */ if ((tex_cube_map_seamless || sampler->CubeMapSeamless) && - !(brw->gen == 7 && !brw->is_haswell && is_integer_format)) { + !(brw->gen == 7 && !brw->is_haswell && texObj->_IsIntegerFormat)) { wrap_s = BRW_TEXCOORDMODE_CUBE; wrap_t = BRW_TEXCOORDMODE_CUBE; wrap_r = BRW_TEXCOORDMODE_CUBE; @@ -520,7 +519,7 @@ brw_update_sampler_state(struct brw_context *brw, wrap_mode_needs_border_color(wrap_t) || wrap_mode_needs_border_color(wrap_r)) { upload_default_color(brw, sampler, format, base_format, - is_integer_format, is_stencil_sampling, + texObj->_IsIntegerFormat, texObj->StencilSampling, &border_color_offset); } @@ -558,8 +557,7 @@ update_sampler_state(struct brw_context *brw, brw_update_sampler_state(brw, texObj->Target, ctx->Texture.CubeMapSeamless, texUnit->LodBias, firstImage->TexFormat, firstImage->_BaseFormat, - texObj->_IsIntegerFormat, texObj->StencilSampling, - sampler, + texObj, sampler, sampler_state, batch_offset_for_sampler_state); } |