Mesa (main): mesa: OpenGL 1.3 and OpenGL ES 1.0 are not optional

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: af4d277cccbba77a78f49c83305f99eef8c12f4a
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=af4d277cccbba77a78f49c83305f99eef8c12f4a

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Tue Dec 14 17:19:01 2021 -0800

mesa: OpenGL 1.3 and OpenGL ES 1.0 are not optional

Reviewed-by: Marek Olšák <marek.olsak at amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14203>

---

 src/mesa/main/version.c | 23 +++++------------------
 1 file changed, 5 insertions(+), 18 deletions(-)

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