diff options
| author | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-09-09 09:00:58 -0600 |
| commit | 7bf63473623e01933adc0e8f4464eda8f2860564 (patch) | |
| tree | 4cfb1b611c999c4b158e6809ee78a02e4d7698b5 /src/mesa/drivers/common | |
| parent | 94a8157ef6bf6695cdc66325c9a7698e64f3e37e (diff) | |
| parent | 0c309bb494b6ee1c403442d1207743f749f95b6e (diff) | |
Merge branch 'mesa_7_6_branch'
Diffstat (limited to 'src/mesa/drivers/common')
| -rw-r--r-- | src/mesa/drivers/common/meta.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/common/meta.c b/src/mesa/drivers/common/meta.c index 6e0905aa49..d1c2232e26 100644 --- a/src/mesa/drivers/common/meta.c +++ b/src/mesa/drivers/common/meta.c @@ -1512,7 +1512,10 @@ _mesa_meta_draw_pixels(GLcontext *ctx, if (_mesa_is_color_format(format)) { /* use more compact format when possible */ - if (format == GL_LUMINANCE || format == GL_LUMINANCE_ALPHA) + /* XXX disable special case for GL_LUMINANCE for now to work around + * apparent i965 driver bug (see bug #23670). + */ + if (/*format == GL_LUMINANCE ||*/ format == GL_LUMINANCE_ALPHA) texIntFormat = format; else texIntFormat = GL_RGBA; |