fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-22 20:00:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: OpenGL 1.3 and OpenGL ES 1.0 are not optional

Browse source 
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14203>
This commit is contained in:
Ian Romanick 2021-12-14 17:19:01 -08:00 • committed by Marge Bot
parent 5f14e98780
commit af4d277ccc
1 changed files with 5 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/mesa/main/version.c
View file

@ -251,9 +251,7 @@ compute_version(const struct gl_extensions *extensions,
{ {
GLuint major, minor, version; GLuint major, minor, version;
const bool ver_1_3 = true; const bool ver_1_4 = (extensions->ARB_depth_texture &&
const bool ver_1_4 = (ver_1_3 &&
extensions->ARB_depth_texture &&
extensions->ARB_shadow && extensions->ARB_shadow &&
extensions->ARB_texture_env_crossbar && extensions->ARB_texture_env_crossbar &&
extensions->EXT_blend_color && extensions->EXT_blend_color &&
@ -472,13 +470,9 @@ compute_version(const struct gl_extensions *extensions,
major = 1; major = 1;
minor = 4; minor = 4;
} }
else if (ver_1_3) {
major = 1;
minor = 3;
}
else { else {
major = 1; major = 1;
minor = 2; minor = 3;
} }
version = major * 10 + minor; version = major * 10 + minor;
@ -492,19 +486,12 @@ compute_version(const struct gl_extensions *extensions,
static GLuint static GLuint
compute_version_es1(const struct gl_extensions *extensions) compute_version_es1(const struct gl_extensions *extensions)
{ {
/* OpenGL ES 1.0 is derived from OpenGL 1.3 */ /* OpenGL ES 1.0 is derived from OpenGL 1.3, which is always supported.
const bool ver_1_0 = true; * OpenGL ES 1.1 is derived from OpenGL 1.5.
/* OpenGL ES 1.1 is derived from OpenGL 1.5 */ */
const bool ver_1_1 = (extensions->EXT_point_parameters); const bool ver_1_1 = (extensions->EXT_point_parameters);
return ver_1_1 ? 11 : 10; return ver_1_1 ? 11 : 10;
if (ver_1_1) {
return 11;
} else if (ver_1_0) {
return 10;
} else {
return 0;
}
} }
static GLuint static GLuint