summaryrefslogtreecommitdiff
path: root/src/gallium/drivers/i965/brw_wm.c
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2010-03-02 16:00:34 +0000
committerJosé Fonseca <jfonseca@vmware.com>2010-03-02 16:00:34 +0000
commit2998cad9ce0c2c60078a28e6a0f3f3bbda3a6535 (patch)
tree05e79ae0d434100c0136247320dd887e40da87a5 /src/gallium/drivers/i965/brw_wm.c
parentfaf8215bae70f020420242dc812ef141fdcf5417 (diff)
parent8598cebf43ea4e1098dbab13b037dd1de216b8b5 (diff)
Merge branch 'gallium-format-cleanup'
Diffstat (limited to 'src/gallium/drivers/i965/brw_wm.c')
-rw-r--r--src/gallium/drivers/i965/brw_wm.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/i965/brw_wm.c b/src/gallium/drivers/i965/brw_wm.c
index 5164c90ed6..dfb718e64f 100644
--- a/src/gallium/drivers/i965/brw_wm.c
+++ b/src/gallium/drivers/i965/brw_wm.c
@@ -254,10 +254,10 @@ static void brw_wm_populate_key( struct brw_context *brw,
for (i = 0; i < brw->curr.num_textures; i++) {
const struct brw_texture *tex = brw_texture(brw->curr.texture[i]);
- if (tex->base.format == PIPE_FORMAT_YCBCR)
+ if (tex->base.format == PIPE_FORMAT_UYVY)
key->yuvtex_mask |= 1 << i;
- if (tex->base.format == PIPE_FORMAT_YCBCR_REV)
+ if (tex->base.format == PIPE_FORMAT_YUYV)
key->yuvtex_swap_mask |= 1 << i;
/* XXX: shadow texture