From 1ec2d0a9a88214dd49ef6b864ec6e37f55c74535 Mon Sep 17 00:00:00 2001 From: Pi Tabred Date: Sat, 14 Dec 2013 10:32:00 -0700 Subject: [PATCH] mesa: Modify format validation to check for extension not context version Reviewed-by: Brian Paul --- src/mesa/main/teximage.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 0d436b2fb21..f92dc1a6932 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -4054,15 +4054,10 @@ _mesa_validate_texbuffer_format(const struct gl_context *ctx, if (datatype == GL_HALF_FLOAT && !ctx->Extensions.ARB_half_float_pixel) return MESA_FORMAT_NONE; - /* The GL_ARB_texture_rg and GL_ARB_texture_buffer_object specs don't make - * any mention of R/RG formats, but they appear in the GL 3.1 core - * specification. - */ - if (ctx->Version <= 30) { + if (!ctx->Extensions.ARB_texture_rg) { GLenum base_format = _mesa_get_format_base_format(format); - if (base_format == GL_R || base_format == GL_RG) - return MESA_FORMAT_NONE; + return MESA_FORMAT_NONE; } if (!ctx->Extensions.ARB_texture_buffer_object_rgb32) { -- 2.30.2