Module: Mesa Branch: master Commit: 9b028faeaa2c4b0ca2e86892aac70a2f2b872fbb URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=9b028faeaa2c4b0ca2e86892aac70a2f2b872fbb
Author: Ian Romanick <ian.d.roman...@intel.com> Date: Fri Jul 27 07:13:03 2012 -0700 mesa/es: Validate glCompressedTexSubImage internalFormat in Mesa code rather than the ES wrapper Signed-off-by: Ian Romanick <ian.d.roman...@intel.com> Reviewed-by: Kenneth Graunke <kenn...@whitecape.org> Reviewed-by: Jordan Justen <jordan.l.jus...@intel.com> --- src/mesa/main/APIspec.xml | 5 ----- src/mesa/main/teximage.c | 10 ++++++++++ 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/APIspec.xml b/src/mesa/main/APIspec.xml index 1ae7212..8b5ad03 100644 --- a/src/mesa/main/APIspec.xml +++ b/src/mesa/main/APIspec.xml @@ -1648,11 +1648,6 @@ <param name="imageSize" type="GLsizei"/> <param name="data" type="const GLvoid *"/> </proto> - - <desc name="format"> - <value name="GL_COMPRESSED_RGB_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/> - <value name="GL_COMPRESSED_RGBA_S3TC_DXT1_EXT" category="EXT_texture_compression_dxt1"/> - </desc> </template> <template name="BlendFuncSeparate"> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 5cf9118..2380efe 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -1381,6 +1381,16 @@ compressedteximage_only_format(const struct gl_context *ctx, GLenum format) { switch (format) { case GL_ETC1_RGB8_OES: + case GL_PALETTE4_RGB8_OES: + case GL_PALETTE4_RGBA8_OES: + case GL_PALETTE4_R5_G6_B5_OES: + case GL_PALETTE4_RGBA4_OES: + case GL_PALETTE4_RGB5_A1_OES: + case GL_PALETTE8_RGB8_OES: + case GL_PALETTE8_RGBA8_OES: + case GL_PALETTE8_R5_G6_B5_OES: + case GL_PALETTE8_RGBA4_OES: + case GL_PALETTE8_RGB5_A1_OES: return GL_TRUE; default: return GL_FALSE; _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-commit