OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st: Turn st_api::query_versions to be direct accessed function st_api_query_versions

Browse Source 
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/19197>
This commit is contained in:
Yonggang Luo
2022-10-22 02:23:07 +08:00
committed by Marge Bot
parent 7bd5ff3122
commit 78a8350e8d
3 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/dri/dri_screen.c
View File

@@ -848,7 +848,7 @@ dri_init_screen_helper(struct dri_screen *screen,
dri_postprocessing_init(screen); dri_postprocessing_init(screen);
screen->st_api->query_versions(screen->st_api, &screen->base, st_api_query_versions(&screen->base,
&screen->options, &screen->options,
&screen->sPriv->max_gl_core_version, &screen->sPriv->max_gl_core_version,
&screen->sPriv->max_gl_compat_version, &screen->sPriv->max_gl_compat_version,

7
src/gallium/include/frontend/api.h
View File

@@ -511,18 +511,19 @@ struct st_api
* The name of the rendering API. This is informative. * The name of the rendering API. This is informative.
*/ */
const char *name; const char *name;
};
/** /**
* Query supported OpenGL versions. (if applicable) * Query supported OpenGL versions. (if applicable)
* The format is (major*10+minor). * The format is (major*10+minor).
*/ */
void (*query_versions)(struct st_api *stapi, struct st_manager *sm, void
st_api_query_versions(struct st_manager *sm,
struct st_config_options *options, struct st_config_options *options,
int *gl_core_version, int *gl_core_version,
int *gl_compat_version, int *gl_compat_version,
int *gl_es1_version, int *gl_es1_version,
int *gl_es2_version); int *gl_es2_version);
};
/** /**
* Create a rendering context. * Create a rendering context.

5
src/mesa/state_tracker/st_manager.c
View File

@@ -1434,8 +1434,8 @@ get_version(struct pipe_screen *screen,
} }
static void void
st_api_query_versions(struct st_api *stapi, struct st_manager *sm, st_api_query_versions(struct st_manager *sm,
struct st_config_options *options, struct st_config_options *options,
int *gl_core_version, int *gl_core_version,
int *gl_compat_version, int *gl_compat_version,
@@ -1451,7 +1451,6 @@ st_api_query_versions(struct st_api *stapi, struct st_manager *sm,
static const struct st_api st_gl_api = { static const struct st_api st_gl_api = {
.name = "Mesa " PACKAGE_VERSION, .name = "Mesa " PACKAGE_VERSION,
.query_versions = st_api_query_versions,
}; };