From 23f94146c987c380bcdebb0d787dc71e808afc27 Mon Sep 17 00:00:00 2001 From: Eduardo Lima Mitev Date: Tue, 22 Dec 2015 19:19:32 +0100 Subject: [PATCH] mesa/formatquery: Add (GET_)TEXTURE_IMAGE_FORMAT pnames Reviewed-by: Dave Airlie --- src/mesa/main/formatquery.c | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c index 32f8cf42953..d9dc5b41630 100644 --- a/src/mesa/main/formatquery.c +++ b/src/mesa/main/formatquery.c @@ -654,6 +654,21 @@ _mesa_query_internal_format_default(struct gl_context *ctx, GLenum target, break; } + case GL_TEXTURE_IMAGE_FORMAT: + case GL_GET_TEXTURE_IMAGE_FORMAT: { + GLenum format = GL_NONE; + GLenum base_format = _mesa_base_tex_format(ctx, internalFormat); + if (base_format > 0) { + if (_mesa_is_enum_format_integer(internalFormat)) + format = _mesa_base_format_to_integer_format(base_format); + else + format = base_format; + } + + params[0] = format; + break; + } + case GL_MANUAL_GENERATE_MIPMAP: case GL_AUTO_GENERATE_MIPMAP: case GL_SRGB_READ: @@ -1135,17 +1150,15 @@ _mesa_GetInternalformativ(GLenum target, GLenum internalformat, GLenum pname, break; case GL_TEXTURE_IMAGE_FORMAT: - /* @TODO */ + 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_FORMAT: - /* @TODO */ - break; - case GL_GET_TEXTURE_IMAGE_TYPE: /* @TODO */ break; -- 2.30.2