From 8d97f5d77eec9d87f18bb7953890307ade7ead8a Mon Sep 17 00:00:00 2001 From: Erik Faye-Lund Date: Mon, 26 May 2025 12:55:59 +0200 Subject: [PATCH] mesa/main: add _mesa_has_texture_multisample-helper MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reduces the number of places we need to keep track of what extensions enables this functionality. Reviewed-by: Marek Olšák Part-of: --- src/mesa/main/context.h | 7 +++++++ src/mesa/main/enable.c | 4 ++-- src/mesa/main/formatquery.c | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/context.h b/src/mesa/main/context.h index 3ceb8bf960c..52a978c6ed8 100644 --- a/src/mesa/main/context.h +++ b/src/mesa/main/context.h @@ -490,6 +490,13 @@ _mesa_has_texture_view(const struct gl_context *ctx) _mesa_has_OES_texture_view(ctx); } +static inline bool +_mesa_has_texture_multisample(const struct gl_context *ctx) +{ + return _mesa_has_ARB_texture_multisample(ctx) || + _mesa_is_gles31(ctx); +} + static inline bool _mesa_hw_select_enabled(const struct gl_context *ctx) { diff --git a/src/mesa/main/enable.c b/src/mesa/main/enable.c index 6e8032b9823..d9e0d903273 100644 --- a/src/mesa/main/enable.c +++ b/src/mesa/main/enable.c @@ -1295,7 +1295,7 @@ _mesa_set_enable(struct gl_context *ctx, GLenum cap, GLboolean state) /* ARB_texture_multisample */ case GL_SAMPLE_MASK: - if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx)) + if (!_mesa_has_texture_multisample(ctx)) goto invalid_enum_error; if (ctx->Multisample.SampleMask == state) return; @@ -1959,7 +1959,7 @@ _mesa_IsEnabled( GLenum cap ) /* ARB_texture_multisample */ case GL_SAMPLE_MASK: - if (!_mesa_has_ARB_texture_multisample(ctx) && !_mesa_is_gles31(ctx)) + if (!_mesa_has_texture_multisample(ctx)) goto invalid_enum_error; return ctx->Multisample.SampleMask; diff --git a/src/mesa/main/formatquery.c b/src/mesa/main/formatquery.c index 44d7c3370f6..4494d856335 100644 --- a/src/mesa/main/formatquery.c +++ b/src/mesa/main/formatquery.c @@ -107,7 +107,7 @@ _legal_parameters(struct gl_context *ctx, GLenum target, GLenum internalformat, * ARB_internalformat_query implementation like an error. */ if (!query2 && - !(_mesa_has_ARB_texture_multisample(ctx) || _mesa_is_gles31(ctx))) { + !_mesa_has_texture_multisample(ctx)) { _mesa_error(ctx, GL_INVALID_ENUM, "glGetInternalformativ(target=%s)", _mesa_enum_to_string(target));