summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/teximage.c
diff options
context:
space:
mode:
authorPi Tabred <[email protected]>2013-12-14 10:32:00 -0700
committerBrian Paul <[email protected]>2013-12-18 09:06:51 -0700
commit1ec2d0a9a88214dd49ef6b864ec6e37f55c74535 (patch)
tree392571b232f1497a887262e7b225a8aa6afd539b /src/mesa/main/teximage.c
parentd5e6fe4d29fcada5f6f75eaff3160aa6ed4a46e3 (diff)
mesa: Modify format validation to check for extension not context version
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src/mesa/main/teximage.c')
-rw-r--r--src/mesa/main/teximage.c9
1 files 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) {