From f1c789fa00ba7216161bcee2691936fd7312d74c Mon Sep 17 00:00:00 2001 From: Antia Puentes Date: Mon, 30 Nov 2015 20:37:24 +0100 Subject: [PATCH] mesa/main: Make legal_get_tex_level_parameter_target public It will be used by the ARB_internalformat_query2 implementation to check if the target is valid for those that are said in the spec that should return the same values than the 'glGetTexLevelParameter{if}v' function: - INTERNALFORMAT_RED_SIZE - INTERNALFORMAT_GREEN_SIZE - INTERNALFORMAT_BLUE_SIZE - INTERNALFORMAT_ALPHA_SIZE - INTERNALFORMAT_DEPTH_SIZE - INTERNALFORMAT_STENCIL_SIZE - INTERNALFORMAT_SHARED_SIZE - INTERNALFORMAT_RED_TYPE - INTERNALFORMAT_GREEN_TYPE - INTERNALFORMAT_BLUE_TYPE - INTERNALFORMAT_ALPHA_TYPE - INTERNALFORMAT_DEPTH_TYPE - INTERNALFORMAT_STENCIL_TYPE - IMAGE_FORMAT_COMPATIBILITY_TYPE Reviewed-by: Dave Airlie --- src/mesa/main/texparam.c | 8 ++++---- src/mesa/main/texparam.h | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/texparam.c b/src/mesa/main/texparam.c index 3b769f436b7..7f3552d349e 100644 --- a/src/mesa/main/texparam.c +++ b/src/mesa/main/texparam.c @@ -1202,9 +1202,9 @@ _mesa_TextureParameterIuiv(GLuint texture, GLenum pname, const GLuint *params) _mesa_texture_parameterIuiv(ctx, texObj, pname, params, true); } -static GLboolean -legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target, - bool dsa) +GLboolean +_mesa_legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target, + bool dsa) { /* Common targets for desktop GL and GLES 3.1. */ switch (target) { @@ -1578,7 +1578,7 @@ valid_tex_level_parameteriv_target(struct gl_context *ctx, GLenum target, bool dsa) { const char *suffix = dsa ? "ture" : ""; - if (!legal_get_tex_level_parameter_target(ctx, target, dsa)) { + if (!_mesa_legal_get_tex_level_parameter_target(ctx, target, dsa)) { _mesa_error(ctx, GL_INVALID_ENUM, "glGetTex%sLevelParameter[if]v(target=%s)", suffix, _mesa_enum_to_string(target)); diff --git a/src/mesa/main/texparam.h b/src/mesa/main/texparam.h index 96defbec213..eca6e6fe5d9 100644 --- a/src/mesa/main/texparam.h +++ b/src/mesa/main/texparam.h @@ -65,6 +65,10 @@ _mesa_texture_parameterIuiv(struct gl_context *ctx, struct gl_texture_object *texObj, GLenum pname, const GLuint *params, bool dsa); +GLboolean +_mesa_legal_get_tex_level_parameter_target(struct gl_context *ctx, GLenum target, + bool dsa); + /*@}*/ /** -- 2.30.2