diff options
| author | Brian Paul <brianp@vmware.com> | 2009-01-28 11:42:42 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-01-28 11:42:42 -0700 |
| commit | 89fddf978c9d2ab5042f89110015234e979c2686 (patch) | |
| tree | 98c8111adc8c5e123845bec32cb7e7a9de997a49 | |
| parent | 72f0b4a55ba36bb8571b4c11d0098361f766814e (diff) | |
i965: minor improvements in brw_wm_populate_key()
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_wm.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c index 24149cf8a1..1683308f44 100644 --- a/src/mesa/drivers/dri/i965/brw_wm.c +++ b/src/mesa/drivers/dri/i965/brw_wm.c @@ -233,14 +233,14 @@ static void brw_wm_populate_key( struct brw_context *brw, /* _NEW_TEXTURE */ for (i = 0; i < BRW_MAX_TEX_UNIT; i++) { const struct gl_texture_unit *unit = &brw->attribs.Texture->Unit[i]; - const struct gl_texture_object *t = unit->_Current; if (unit->_ReallyEnabled) { - if (t->Image[0][t->BaseLevel]->InternalFormat == GL_YCBCR_MESA) { - key->yuvtex_mask |= 1<<i; - if (t->Image[0][t->BaseLevel]->TexFormat->MesaFormat == - MESA_FORMAT_YCBCR) - key->yuvtex_swap_mask |= 1<< i; + const struct gl_texture_object *t = unit->_Current; + const struct gl_texture_image *img = t->Image[0][t->BaseLevel]; + if (img->InternalFormat == GL_YCBCR_MESA) { + key->yuvtex_mask |= 1 << i; + if (img->TexFormat->MesaFormat == MESA_FORMAT_YCBCR) + key->yuvtex_swap_mask |= 1 << i; } } } |