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

r300g: fix regression in texdepth.

Browse source 
texdepth stopped working when npot went in, this brings it back
to life.

< MostAwesomeDude> That looks like what I was going to do.

Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2010-04-15 14:56:20 +10:00
parent c8efed89ba
commit 7d93f2bf84
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/gallium/drivers/r300/r300_fs.c
View file

@ -140,14 +140,11 @@ static void get_external_state(
for (i = 0; i < texstate->sampler_state_count; i++) {
struct r300_sampler_state* s = texstate->sampler_states[i];
struct r300_texture *t;
if (!s || !texstate->sampler_views[i]) {
if (!s) {
continue;
}
t = (struct r300_texture*)texstate->sampler_views[i]->base.texture;
if (s->state.compare_mode == PIPE_TEX_COMPARE_R_TO_TEXTURE) {
/* XXX Gallium doesn't provide us with any information regarding
* this mode, so we are screwed. I'm setting 0 = LUMINANCE. */
@ -157,7 +154,12 @@ static void get_external_state(
state->unit[i].texture_compare_func = s->state.compare_func;
}
state->unit[i].fake_npot = t->uses_pitch;
if (texstate->sampler_views[i]) {
struct r300_texture *t;
t = (struct r300_texture*)texstate->sampler_views[i]->base.texture;
state->unit[i].fake_npot = t->uses_pitch;
}
state->unit[i].non_normalized_coords = !s->state.normalized_coords;
/* XXX this should probably take into account STR, not just S. */