Mesa (marge_bot_batch_merge_job): mesa: OpenGL ES 1.1 is not optional

[GitLab Mirror]

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

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

mesa: OpenGL ES 1.1 is not optional

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

---

 src/mesa/main/version.c | 13 +------------
 1 file changed, 1 insertion(+), 12 deletions(-)

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index b35f0903215..92f5db4126a 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -477,17 +477,6 @@ compute_version(const struct gl_extensions *extensions,
    return version;
 }
 
-static GLuint
-compute_version_es1(const struct gl_extensions *extensions)
-{
-   /* 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 = true;
-
-   return ver_1_1 ? 11 : 10;
-}
-
 static GLuint
 compute_version_es2(const struct gl_extensions *extensions,
                     const struct gl_constants *consts)
@@ -592,7 +581,7 @@ _mesa_get_version(const struct gl_extensions *extensions,
    case API_OPENGL_CORE:
       return compute_version(extensions, consts, api);
    case API_OPENGLES:
-      return compute_version_es1(extensions);
+      return 11;
    case API_OPENGLES2:
       return compute_version_es2(extensions, consts);
    }