[mutter] cogl: GLES3 has sampler objects
- From: Jonas Ådahl <jadahl src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [mutter] cogl: GLES3 has sampler objects
- Date: Wed, 19 Feb 2020 18:02:46 +0000 (UTC)
commit 03ef335a70507ecd46d877f2c711591777007da3
Author: Adam Jackson <ajax redhat com>
Date: Tue Oct 22 17:04:23 2019 -0400
cogl: GLES3 has sampler objects
https://gitlab.gnome.org/GNOME/mutter/merge_requests/882
cogl/cogl/driver/gl/gles/cogl-driver-gles.c | 3 +++
cogl/cogl/gl-prototypes/cogl-all-functions.h | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
---
diff --git a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
index 09c9dd788..4d80e5c69 100644
--- a/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
+++ b/cogl/cogl/driver/gl/gles/cogl-driver-gles.c
@@ -314,6 +314,9 @@ _cogl_driver_update_features (CoglContext *context,
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_ANY_GL, TRUE);
COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES, TRUE);
+ if (context->glGenSamplers)
+ COGL_FLAGS_SET (private_features, COGL_PRIVATE_FEATURE_SAMPLER_OBJECTS, TRUE);
+
if (context->glBlitFramebuffer)
COGL_FLAGS_SET (private_features,
COGL_PRIVATE_FEATURE_BLIT_FRAMEBUFFER, TRUE);
diff --git a/cogl/cogl/gl-prototypes/cogl-all-functions.h b/cogl/cogl/gl-prototypes/cogl-all-functions.h
index 80d60702d..365cf63d7 100644
--- a/cogl/cogl/gl-prototypes/cogl-all-functions.h
+++ b/cogl/cogl/gl-prototypes/cogl-all-functions.h
@@ -162,7 +162,7 @@ COGL_EXT_FUNCTION (void, glFramebufferTexture2DMultisampleIMG,
COGL_EXT_END ()
COGL_EXT_BEGIN (ARB_sampler_objects, 3, 3,
- 0, /* not in either GLES */
+ COGL_EXT_IN_GLES3,
"ARB:\0",
"sampler_objects\0")
COGL_EXT_FUNCTION (void, glGenSamplers,
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]