fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-02-03 21:40:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

i965/sampler_state: Pass texObj into update_sampler_state

Browse source 
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "17.0 13.0" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit c4f8f395b2)
This commit is contained in:
Jason Ekstrand 2017-02-06 19:46:22 -08:00 • committed by Emil Velikov
parent 0683feb18c
commit bbe50d9b03
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/drivers/dri/i965/brw_sampler_state.c
View file

@ -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;
@ -517,7 +516,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);
}
@ -555,8 +554,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);
}