From 7417e9a171736b5279881cd4381fb58c617a23d9 Mon Sep 17 00:00:00 2001 From: marha Date: Mon, 28 Nov 2011 08:33:39 +0100 Subject: mesa git update 28 nov 2011 --- mesalib/src/mesa/main/image.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'mesalib/src/mesa/main/image.c') 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; } -- cgit v1.2.3