Module: Mesa Branch: main Commit: 23388be282c9df1a35f2fa878b26a1ee136c6fea URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=23388be282c9df1a35f2fa878b26a1ee136c6fea
Author: Yonggang Luo <[email protected]> Date: Sat Oct 22 02:28:57 2022 +0800 st: OpenVG are removed, remove st_api::feature_mask as it's constant Signed-off-by: Yonggang Luo <[email protected]> Reviewed-by: Jesse Natalie <[email protected]> Reviewed-by: Marek Olšák <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19197> --- src/gallium/frontends/dri/dri_screen.c | 6 +----- src/gallium/include/frontend/api.h | 16 ---------------- src/mesa/state_tracker/st_manager.c | 1 - 3 files changed, 1 insertion(+), 22 deletions(-) diff --git a/src/gallium/frontends/dri/dri_screen.c b/src/gallium/frontends/dri/dri_screen.c index 60e06b2fd9c..5e4119df43d 100644 --- a/src/gallium/frontends/dri/dri_screen.c +++ b/src/gallium/frontends/dri/dri_screen.c @@ -439,7 +439,6 @@ dri_fill_in_modes(struct dri_screen *screen) uint8_t depth_bits_array[5]; uint8_t stencil_bits_array[5]; unsigned depth_buffer_factor; - unsigned msaa_samples_max; unsigned i; struct pipe_screen *p_screen = screen->base.screen; bool pf_z16, pf_x8z24, pf_z24x8, pf_s8z24, pf_z24s8, pf_z32; @@ -467,9 +466,6 @@ dri_fill_in_modes(struct dri_screen *screen) allow_rgb10 = driQueryOptionb(&screen->dev->option_cache, "allow_rgb10_configs"); allow_fp16 = dri_loader_get_cap(screen, DRI_LOADER_CAP_FP16); - msaa_samples_max = (screen->st_api->feature_mask & ST_API_FEATURE_MS_VISUALS_MASK) - ? MSAA_VISUAL_MAX_SAMPLES : 1; - pf_x8z24 = p_screen->is_format_supported(p_screen, PIPE_FORMAT_Z24X8_UNORM, PIPE_TEXTURE_2D, 0, 0, PIPE_BIND_DEPTH_STENCIL); @@ -545,7 +541,7 @@ dri_fill_in_modes(struct dri_screen *screen) PIPE_BIND_DISPLAY_TARGET)) continue; - for (i = 1; i <= msaa_samples_max; i++) { + for (i = 1; i <= MSAA_VISUAL_MAX_SAMPLES; i++) { int samples = i > 1 ? i : 0; if (p_screen->is_format_supported(p_screen, pipe_formats[format], diff --git a/src/gallium/include/frontend/api.h b/src/gallium/include/frontend/api.h index 9d792b914d9..d38d78e1247 100644 --- a/src/gallium/include/frontend/api.h +++ b/src/gallium/include/frontend/api.h @@ -58,17 +58,6 @@ enum st_profile_type ST_PROFILE_OPENGL_ES1_MASK | \ ST_PROFILE_OPENGL_ES2_MASK) -/** - * Optional API features. - */ -enum st_api_feature -{ - ST_API_FEATURE_MS_VISUALS /**< support for multisample visuals */ -}; - -/* for feature_mask in st_api */ -#define ST_API_FEATURE_MS_VISUALS_MASK (1 << ST_API_FEATURE_MS_VISUALS) - /** * New context flags for GL 3.0 and beyond. * @@ -523,11 +512,6 @@ struct st_api */ const char *name; - /** - * The supported optional features. Tested with ST_FEATURE_*_MASK. - */ - unsigned feature_mask; - /** * Destroy the API. */ diff --git a/src/mesa/state_tracker/st_manager.c b/src/mesa/state_tracker/st_manager.c index 10f38ba4175..d10a8d3b47c 100644 --- a/src/mesa/state_tracker/st_manager.c +++ b/src/mesa/state_tracker/st_manager.c @@ -1458,7 +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, - .feature_mask = ST_API_FEATURE_MS_VISUALS_MASK, .destroy = st_api_destroy, .query_versions = st_api_query_versions, .create_context = st_api_create_context,
