projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
intel: Pack colors for blit at blit time, rather than at ClearColor.
[mesa.git]
/
src
/
mesa
/
drivers
/
dri
/
intel
/
intel_tex_format.c
diff --git
a/src/mesa/drivers/dri/intel/intel_tex_format.c
b/src/mesa/drivers/dri/intel/intel_tex_format.c
index f37a545c7f8d72cebea60ae2e0b39e16695c5a06..bfa3dba1f5cbf5e4ec3e90e1ec83e6fb0048082c 100644
(file)
--- a/
src/mesa/drivers/dri/intel/intel_tex_format.c
+++ b/
src/mesa/drivers/dri/intel/intel_tex_format.c
@@
-95,14
+95,20
@@
intelChooseTextureFormat(GLcontext * ctx, GLint internalFormat,
case GL_COMPRESSED_LUMINANCE:
return MESA_FORMAT_L8;
case GL_COMPRESSED_LUMINANCE:
return MESA_FORMAT_L8;
+ case GL_LUMINANCE12_ALPHA4:
+ case GL_LUMINANCE12_ALPHA12:
+ case GL_LUMINANCE16_ALPHA16:
+#ifndef I915
+ return MESA_FORMAT_AL1616;
+#else
+ /* FALLTHROUGH */
+#endif
+
case 2:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE4_ALPHA4:
case GL_LUMINANCE6_ALPHA2:
case GL_LUMINANCE8_ALPHA8:
case 2:
case GL_LUMINANCE_ALPHA:
case GL_LUMINANCE4_ALPHA4:
case GL_LUMINANCE6_ALPHA2:
case GL_LUMINANCE8_ALPHA8:
- case GL_LUMINANCE12_ALPHA4:
- case GL_LUMINANCE12_ALPHA12:
- case GL_LUMINANCE16_ALPHA16:
case GL_COMPRESSED_LUMINANCE_ALPHA:
return MESA_FORMAT_AL88;
case GL_COMPRESSED_LUMINANCE_ALPHA:
return MESA_FORMAT_AL88;