aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/image.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-11-28 08:38:39 +0100
committermarha <marha@users.sourceforge.net>2011-11-28 08:38:39 +0100
commit22fb212bb84a69ab20a494aed1c197da1d2dbdf7 (patch)
treed11c21c9260bee0f56c34ee6e241671befd5257f /mesalib/src/mesa/main/image.c
parentc1296df0ebe19a8e90fb7d7f0135d7034f16a76d (diff)
parent7417e9a171736b5279881cd4381fb58c617a23d9 (diff)
downloadvcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.gz
vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.tar.bz2
vcxsrv-22fb212bb84a69ab20a494aed1c197da1d2dbdf7.zip
Merge remote-tracking branch 'origin/released'
Diffstat (limited to 'mesalib/src/mesa/main/image.c')
-rw-r--r--mesalib/src/mesa/main/image.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/mesalib/src/mesa/main/image.c b/mesalib/src/mesa/main/image.c
index 914a99923..ca31e53a8 100644
--- a/mesalib/src/mesa/main/image.c
+++ b/mesalib/src/mesa/main/image.c
@@ -545,11 +545,12 @@ _mesa_is_legal_format_and_type(const struct gl_context *ctx,
case GL_UNSIGNED_SHORT:
case GL_INT:
case GL_UNSIGNED_INT:
+ return ctx->Extensions.EXT_texture_integer;
case GL_UNSIGNED_BYTE_3_3_2:
case GL_UNSIGNED_BYTE_2_3_3_REV:
case GL_UNSIGNED_SHORT_5_6_5:
case GL_UNSIGNED_SHORT_5_6_5_REV:
- return ctx->Extensions.EXT_texture_integer;
+ return ctx->Extensions.ARB_texture_rgb10_a2ui;
default:
return GL_FALSE;
}
@@ -577,6 +578,7 @@ _mesa_is_legal_format_and_type(const struct gl_context *ctx,
case GL_UNSIGNED_SHORT:
case GL_INT:
case GL_UNSIGNED_INT:
+ return ctx->Extensions.EXT_texture_integer;
case GL_UNSIGNED_SHORT_4_4_4_4:
case GL_UNSIGNED_SHORT_4_4_4_4_REV:
case GL_UNSIGNED_SHORT_5_5_5_1:
@@ -585,7 +587,7 @@ _mesa_is_legal_format_and_type(const struct gl_context *ctx,
case GL_UNSIGNED_INT_8_8_8_8_REV:
case GL_UNSIGNED_INT_10_10_10_2:
case GL_UNSIGNED_INT_2_10_10_10_REV:
- return ctx->Extensions.EXT_texture_integer;
+ return ctx->Extensions.ARB_texture_rgb10_a2ui;
default:
return GL_FALSE;
}