From 063980151e801fca6c314e14c82e9a7b8c04a4d2 Mon Sep 17 00:00:00 2001 From: Anuj Phogat Date: Fri, 21 Feb 2014 16:58:07 -0800 Subject: mesa: Set initial internal format of a texture to GL_RGBA From OpenGL 4.0 spec, page 398: "The initial internal format of a texel array is RGBA instead of 1. TEXTURE_COMPONENTS is deprecated; always use TEXTURE_INTERNAL_FORMAT." Fixes Khronos OpenGL CTS test failure: proxy_textures_invalid_size Cc: Signed-off-by: Anuj Phogat Reviewed-by: Brian Paul --- src/mesa/main/texparam.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'src/mesa/main/texparam.c') diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index bbdbc276388..e867dbf740c 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -1038,9 +1038,16 @@ get_tex_level_parameter_image(struct gl_context *ctx, img = _mesa_select_tex_image(ctx, texObj, target, level); if (!img || img->TexFormat == MESA_FORMAT_NONE) { - /* undefined texture image */ - if (pname == GL_TEXTURE_COMPONENTS) - *params = 1; + /* In case of undefined texture image return the default values. + * + * From OpenGL 4.0 spec, page 398: + * "The initial internal format of a texel array is RGBA + * instead of 1. TEXTURE_COMPONENTS is deprecated; always + * use TEXTURE_INTERNAL_FORMAT." + */ + + if (pname == GL_TEXTURE_INTERNAL_FORMAT) + *params = GL_RGBA; else *params = 0; return; -- cgit v1.2.3