From 44151acc95d47bb2e82f2ae24ab9df8460349eab Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Sat, 22 Oct 2022 02:05:55 +0800 Subject: [PATCH] st: OpenVG are removed, remove st_api::profile_mask as it's constant MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Yonggang Luo Reviewed-by: Jesse Natalie Reviewed-by: Marek Olšák Part-of: --- src/gallium/include/frontend/api.h | 9 ++++----- src/mesa/state_tracker/st_manager.c | 7 +------ 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/gallium/include/frontend/api.h b/src/gallium/include/frontend/api.h index 4cee640c8a7..9d792b914d9 100644 --- a/src/gallium/include/frontend/api.h +++ b/src/gallium/include/frontend/api.h @@ -53,6 +53,10 @@ enum st_profile_type #define ST_PROFILE_OPENGL_CORE_MASK (1 << ST_PROFILE_OPENGL_CORE) #define ST_PROFILE_OPENGL_ES1_MASK (1 << ST_PROFILE_OPENGL_ES1) #define ST_PROFILE_OPENGL_ES2_MASK (1 << ST_PROFILE_OPENGL_ES2) +#define ST_PROFILE_ALL_MASK (ST_PROFILE_DEFAULT_MASK | \ + ST_PROFILE_OPENGL_CORE_MASK | \ + ST_PROFILE_OPENGL_ES1_MASK | \ + ST_PROFILE_OPENGL_ES2_MASK) /** * Optional API features. @@ -519,11 +523,6 @@ struct st_api */ const char *name; - /** - * The supported profiles. Tested with ST_PROFILE_*_MASK. - */ - unsigned profile_mask; - /** * The supported optional features. Tested with ST_FEATURE_*_MASK. */ diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 648fbab0911..10f38ba4175 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -1019,7 +1019,7 @@ st_api_create_context(struct st_api *stapi, struct st_manager *smapi, bool no_error = false; unsigned ctx_flags = PIPE_CONTEXT_PREFER_THREADED; - if (!(stapi->profile_mask & (1 << attribs->profile))) + if (!(ST_PROFILE_ALL_MASK & (1 << attribs->profile))) return NULL; switch (attribs->profile) { @@ -1458,11 +1458,6 @@ st_api_query_versions(struct st_api *stapi, struct st_manager *sm, static const struct st_api st_gl_api = { .name = "Mesa " PACKAGE_VERSION, - .profile_mask = ST_PROFILE_DEFAULT_MASK | - ST_PROFILE_OPENGL_CORE_MASK | - ST_PROFILE_OPENGL_ES1_MASK | - ST_PROFILE_OPENGL_ES2_MASK | - 0, .feature_mask = ST_API_FEATURE_MS_VISUALS_MASK, .destroy = st_api_destroy, .query_versions = st_api_query_versions,