summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Pablo Ceballos <pceballos@google.com> 2016-04-14 17:10:26 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-04-14 17:10:26 +0000
commit202e6e932cfd9bd97053681da438146d151286cc (patch)
treec25716a128c0bfb19acd655ff935fb9251bf1c11
parent6979bb988915d22b3463aacdf4d86c5c8ab3b2ac (diff)
parentceb9ee78bdc7b3a074d01380ce11432f88732094 (diff)
Merge "egl: add EGL_KHR_mutable_render_buffer" into nyc-dev
-rw-r--r--opengl/include/EGL/eglext.h4
-rw-r--r--opengl/libs/EGL/eglApi.cpp1
2 files changed, 5 insertions, 0 deletions
diff --git a/opengl/include/EGL/eglext.h b/opengl/include/EGL/eglext.h
index b1f51f76e7..bef5f02aa3 100644
--- a/opengl/include/EGL/eglext.h
+++ b/opengl/include/EGL/eglext.h
@@ -616,6 +616,10 @@ typedef EGLAPI EGLClientBuffer (EGLAPIENTRYP PFNEGLCREATENATIVECLIENTBUFFERANDRO
#define EGL_FRONT_BUFFER_AUTO_REFRESH_ANDROID 0x314C
#endif
+#ifndef EGL_KHR_mutable_render_buffer
+#define EGL_KHR_mutable_render_buffer 1
+#define EGL_MUTABLE_RENDER_BUFFER_BIT_KHR 0x1000
+#endif
#ifdef __cplusplus
}
diff --git a/opengl/libs/EGL/eglApi.cpp b/opengl/libs/EGL/eglApi.cpp
index b99757442c..613b63b28c 100644
--- a/opengl/libs/EGL/eglApi.cpp
+++ b/opengl/libs/EGL/eglApi.cpp
@@ -115,6 +115,7 @@ extern char const * const gExtensionString =
"EGL_KHR_partial_update " // strongly recommended
"EGL_EXT_buffer_age " // strongly recommended with partial_update
"EGL_KHR_create_context_no_error "
+ "EGL_KHR_mutable_render_buffer "
;
// extensions not exposed to applications but used by the ANDROID system