summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDudemanguy <random342@airmail.cc>2021-11-10 09:17:10 -0600
committersfan5 <sfan5@live.de>2021-12-19 15:53:30 +0100
commitbde10d2771c254a7eea0c1a68560d0bee4cb55a3 (patch)
treeee98cbac37ad8f58330ca220fb5ab9549d85c30d
parent22c1468b5a80068f7cce1f5c5e82ec69435f9d28 (diff)
downloadmpv-bde10d2771c254a7eea0c1a68560d0bee4cb55a3.tar.bz2
mpv-bde10d2771c254a7eea0c1a68560d0bee4cb55a3.tar.xz
egl_helpers: remove EGL_OPENGL_ES3_BIT
d2e8bc449986e012f257249a996386bd323febd0 was the the commit that originally introduced the usage of this bit. As the message states, the purpose was to force creating GLES 3 contexts on drivers that do not return a higher version context than what was requested. With the recent opengl refactors, mpv's gl selection has already moved away from such complicated queries. Perhaps when that commit was added things were different, but nowadays it seems like Mesa simply returns the highest driver version available that is compatibile with the request (i.e. requesting GLES 2 returns a GLES 3 context on my machine). In that case, let's just simply drop EGL_OPENGL_ES3_BIT altogether as it does break GLES 2 only machines. Fixes #9431.
-rw-r--r--video/out/opengl/egl_helpers.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/video/out/opengl/egl_helpers.c b/video/out/opengl/egl_helpers.c
index 0766be3c54..a81f9f4853 100644
--- a/video/out/opengl/egl_helpers.c
+++ b/video/out/opengl/egl_helpers.c
@@ -41,7 +41,6 @@
#define EGL_CONTEXT_OPENGL_PROFILE_MASK 0x30FD
#define EGL_CONTEXT_OPENGL_CORE_PROFILE_BIT 0x00000001
#define EGL_CONTEXT_OPENGL_FORWARD_COMPATIBLE 0x31B1
-#define EGL_OPENGL_ES3_BIT 0x00000040
typedef intptr_t EGLAttrib;
#endif
@@ -117,7 +116,7 @@ static bool create_context(struct ra_ctx *ctx, EGLDisplay display,
name = "Desktop OpenGL";
} else {
api = EGL_OPENGL_ES_API;
- rend = EGL_OPENGL_ES2_BIT | EGL_OPENGL_ES3_BIT;
+ rend = EGL_OPENGL_ES2_BIT;
name = "GLES 2.x +";
}