summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/waffle/waffle_enum.h1
-rw-r--r--src/waffle/api/waffle_display.c1
-rw-r--r--src/waffle/api/waffle_enum.c1
-rw-r--r--src/waffle/cgl/cgl_config.m4
-rw-r--r--src/waffle/core/wcore_config_attrs.c17
-rw-r--r--src/waffle/egl/wegl_config.c18
-rw-r--r--src/waffle/egl/wegl_config.h1
-rw-r--r--src/waffle/egl/wegl_context.c6
-rw-r--r--src/waffle/egl/wegl_display.c1
-rw-r--r--src/waffle/glx/glx_config.c4
10 files changed, 0 insertions, 54 deletions
diff --git a/include/waffle/waffle_enum.h b/include/waffle/waffle_enum.h
index 0437d64..df87e0e 100644
--- a/include/waffle/waffle_enum.h
+++ b/include/waffle/waffle_enum.h
@@ -65,7 +65,6 @@ enum waffle_enum {
WAFFLE_CONTEXT_OPENGL = 0x020b,
WAFFLE_CONTEXT_OPENGL_ES1 = 0x020c,
WAFFLE_CONTEXT_OPENGL_ES2 = 0x020d,
- WAFFLE_CONTEXT_OPENGL_ES3 = 0x0214,
WAFFLE_CONTEXT_MAJOR_VERSION = 0x020e,
WAFFLE_CONTEXT_MINOR_VERSION = 0x020f,
diff --git a/src/waffle/api/waffle_display.c b/src/waffle/api/waffle_display.c
index 2ced67a..98f3cca 100644
--- a/src/waffle/api/waffle_display.c
+++ b/src/waffle/api/waffle_display.c
@@ -88,7 +88,6 @@ waffle_display_supports_context_api(
case WAFFLE_CONTEXT_OPENGL:
case WAFFLE_CONTEXT_OPENGL_ES1:
case WAFFLE_CONTEXT_OPENGL_ES2:
- case WAFFLE_CONTEXT_OPENGL_ES3:
break;
default:
wcore_errorf(WAFFLE_ERROR_BAD_PARAMETER,
diff --git a/src/waffle/api/waffle_enum.c b/src/waffle/api/waffle_enum.c
index fbbe0c9..9d79385 100644
--- a/src/waffle/api/waffle_enum.c
+++ b/src/waffle/api/waffle_enum.c
@@ -51,7 +51,6 @@ waffle_enum_to_string(int32_t e)
CASE(WAFFLE_CONTEXT_OPENGL);
CASE(WAFFLE_CONTEXT_OPENGL_ES1);
CASE(WAFFLE_CONTEXT_OPENGL_ES2);
- CASE(WAFFLE_CONTEXT_OPENGL_ES3);
CASE(WAFFLE_CONTEXT_MAJOR_VERSION);
CASE(WAFFLE_CONTEXT_MINOR_VERSION);
CASE(WAFFLE_CONTEXT_PROFILE);
diff --git a/src/waffle/cgl/cgl_config.m b/src/waffle/cgl/cgl_config.m
index 33ac0d3..1369149 100644
--- a/src/waffle/cgl/cgl_config.m
+++ b/src/waffle/cgl/cgl_config.m
@@ -88,10 +88,6 @@ cgl_config_check_attrs(const struct wcore_config_attrs *attrs)
wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
"CGL does not support OpenGL ES2");
return false;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
- "CGL does not support OpenGL ES3");
- return false;
default:
assert(false);
return false;
diff --git a/src/waffle/core/wcore_config_attrs.c b/src/waffle/core/wcore_config_attrs.c
index 3d26c81..a847806 100644
--- a/src/waffle/core/wcore_config_attrs.c
+++ b/src/waffle/core/wcore_config_attrs.c
@@ -79,11 +79,6 @@ wcore_config_attrs_set_defaults(
attrs->context_minor_version = 0;
attrs->context_profile = WAFFLE_NONE;
return true;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- attrs->context_major_version = 3;
- attrs->context_minor_version = 0;
- attrs->context_profile = WAFFLE_NONE;
- return true;
default:
wcore_errorf(WAFFLE_ERROR_BAD_ATTRIBUTE,
"WAFFLE_CONTEXT_API has bad value %#x",
@@ -161,18 +156,6 @@ wcore_config_attrs_check_context(struct wcore_config_attrs *attrs)
return true;
}
- case WAFFLE_CONTEXT_OPENGL_ES3: {
- if (version != 30) {
- wcore_errorf(WAFFLE_ERROR_BAD_ATTRIBUTE,
- "the context version must 3.0 for OpenGL ES3");
- return false;
- }
-
- if (attrs->context_profile != WAFFLE_NONE)
- goto bad_profile;
-
- return true;
- }
default:
wcore_errorf(WAFFLE_ERROR_BAD_ATTRIBUTE,
"WAFFLE_CONTEXT_API has bad value %#x",
diff --git a/src/waffle/egl/wegl_config.c b/src/waffle/egl/wegl_config.c
index 72554b1..28dd8e9 100644
--- a/src/waffle/egl/wegl_config.c
+++ b/src/waffle/egl/wegl_config.c
@@ -85,21 +85,6 @@ check_context_attrs(struct wegl_display *dpy,
return true;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- if (!dpy->KHR_create_context) {
- wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
- "EGL_KHR_create_context is required to create "
- "an OpenGL ES3 context");
- }
-
- if (!plat->vtbl->dl_can_open(plat, WAFFLE_DL_OPENGL_ES2)) {
- wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
- "failed to open the OpenGL ES2 library");
- return false;
- }
-
- return true;
-
default:
wcore_error_internal("context_api has bad value %#x",
attrs->context_api);
@@ -161,9 +146,6 @@ choose_real_config(struct wegl_display *dpy,
case WAFFLE_CONTEXT_OPENGL_ES2:
attrib_list[renderable_index] = EGL_OPENGL_ES2_BIT;
break;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- attrib_list[renderable_index] = EGL_OPENGL_ES3_BIT_KHR;
- break;
default:
wcore_error_internal("waffle_context_api has bad value %#x",
attrs->context_api);
diff --git a/src/waffle/egl/wegl_config.h b/src/waffle/egl/wegl_config.h
index 7128898..a9e3cb9 100644
--- a/src/waffle/egl/wegl_config.h
+++ b/src/waffle/egl/wegl_config.h
@@ -29,7 +29,6 @@
#include <stdint.h>
#include <EGL/egl.h>
-#include <EGL/eglext.h>
#include "wcore_config.h"
#include "wcore_util.h"
diff --git a/src/waffle/egl/wegl_context.c b/src/waffle/egl/wegl_context.c
index 3cf4ba3..b594e39 100644
--- a/src/waffle/egl/wegl_context.c
+++ b/src/waffle/egl/wegl_context.c
@@ -45,7 +45,6 @@ bind_api(int32_t waffle_context_api)
break;
case WAFFLE_CONTEXT_OPENGL_ES1:
case WAFFLE_CONTEXT_OPENGL_ES2:
- case WAFFLE_CONTEXT_OPENGL_ES3:
ok &= eglBindAPI(EGL_OPENGL_ES_API);
break;
default:
@@ -95,11 +94,6 @@ create_real_context(struct wegl_config *config,
attrib_list[1] = 2;
attrib_list[2] = EGL_NONE;
break;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- attrib_list[0] = EGL_CONTEXT_CLIENT_VERSION;
- attrib_list[1] = 3;
- attrib_list[2] = EGL_NONE;
- break;
default:
wcore_error_internal("waffle_context_api has bad value %#x",
waffle_context_api);
diff --git a/src/waffle/egl/wegl_display.c b/src/waffle/egl/wegl_display.c
index 9dcc29a..37016cd 100644
--- a/src/waffle/egl/wegl_display.c
+++ b/src/waffle/egl/wegl_display.c
@@ -117,7 +117,6 @@ wegl_display_supports_context_api(struct wcore_display *wc_dpy,
waffle_dl = WAFFLE_DL_OPENGL_ES1;
break;
case WAFFLE_CONTEXT_OPENGL_ES2:
- case WAFFLE_CONTEXT_OPENGL_ES3:
waffle_dl = WAFFLE_DL_OPENGL_ES2;
break;
default:
diff --git a/src/waffle/glx/glx_config.c b/src/waffle/glx/glx_config.c
index 4cb73a5..868c9c7 100644
--- a/src/waffle/glx/glx_config.c
+++ b/src/waffle/glx/glx_config.c
@@ -99,10 +99,6 @@ glx_config_check_context_attrs(struct glx_display *dpy,
return false;
}
return true;
- case WAFFLE_CONTEXT_OPENGL_ES3:
- wcore_errorf(WAFFLE_ERROR_UNSUPPORTED_ON_PLATFORM,
- "GLX does not support OpenGL ES3");
- return false;
default:
wcore_error_internal("context_api has bad value %#x",
attrs->context_api);
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 07:10:48 +0000