fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

sampler state tweaks

Browse source
This commit is contained in:
keithw 2007-08-24 10:09:34 +01:00 • committed by Keith Whitwell
parent f9a77a3080
commit b4d8be235b
2 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mesa/pipe/i915simple/i915_state_derived.c
View file

@ -174,7 +174,7 @@ void i915_update_derived( struct i915_context *i915 )
if (i915->dirty & (I915_NEW_SETUP | I915_NEW_FS))
calculate_vertex_layout( i915 );
if (i915->dirty & I915_NEW_SAMPLER)
if (i915->dirty & (I915_NEW_SAMPLER | I915_NEW_TEXTURE))
i915_update_samplers(i915);
if (i915->dirty & I915_NEW_TEXTURE)

7
src/mesa/pipe/i915simple/i915_state_sampler.c
View file

@ -155,7 +155,6 @@ static void update_sampler(struct i915_context *i915,
uint unit,
const struct pipe_sampler_state *sampler,
const struct pipe_mipmap_tree *mt,
const struct pipe_surface *surface,
unsigned state[3] )
{
const unsigned ws = sampler->wrap_s;
@ -187,8 +186,8 @@ static void update_sampler(struct i915_context *i915,
state[0] |= ((b << SS2_LOD_BIAS_SHIFT) & SS2_LOD_BIAS_MASK);
}
if (surface->format == PIPE_FORMAT_YCBCR ||
surface->format == PIPE_FORMAT_YCBCR_REV)
if (mt->format == PIPE_FORMAT_YCBCR ||
mt->format == PIPE_FORMAT_YCBCR_REV)
state[0] |= SS2_COLORSPACE_CONVERSION;
@ -259,7 +258,6 @@ static void update_sampler(struct i915_context *i915,
void i915_update_samplers( struct i915_context *i915 )
{
const struct pipe_surface *surface = i915->framebuffer.cbufs[0];
uint unit;
i915->current.sampler_enable_nr = 0;
@ -273,7 +271,6 @@ void i915_update_samplers( struct i915_context *i915 )
unit,
i915->sampler + unit, /* sampler state */
i915->texture[unit], /* mipmap tree */
surface, /* cbuffer info */
i915->current.sampler[unit] /* the result */
);