From ec299602a6a1db209e8e93c0853ccad1eb4ffa72 Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Tue, 22 Dec 2015 19:33:57 +0100 Subject: [PATCH] mesa/formatquery: Add (GET_)TEXTURE_IMAGE_TYPE pnames These basically reuse the default implementation of GL_READ_PIXELS_TYPE. Reviewed-by: Dave Airlie --- src/mesa/main/formatquery.c | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c index d9dc5b41630..215c14f889f 100644 --- a/src/mesa/main/formatquery.c +++ b/src/mesa/main/formatquery.c @@ -645,7 +645,9 @@ _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target, break; } - case GL_READ_PIXELS_TYPE: { + case GL_READ_PIXELS_TYPE: + case GL_TEXTURE_IMAGE_TYPE: + case GL_GET_TEXTURE_IMAGE_TYPE: { GLenum base_format = _mesa_base_tex_format(ctx, internalFormat); if (base_format > 0) params[0] = _mesa_generic_type_for_internal_format(internalFormat); @@ -1151,16 +1153,10 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, case GL_TEXTURE_IMAGE_FORMAT: case GL_GET_TEXTURE_IMAGE_FORMAT: - ctx->Driver.QueryInternalFormat(ctx, target, internalformat, pname, - buffer); - break; - case GL_TEXTURE_IMAGE_TYPE: - /* @TODO */ - break; - case GL_GET_TEXTURE_IMAGE_TYPE: - /* @TODO */ + ctx->Driver.QueryInternalFormat(ctx, target, internalformat, pname, + buffer); break; case GL_MIPMAP: -- 2.30.2