diff options
| author | David Turner <digit@google.com> | 2015-07-16 11:36:39 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2015-07-16 11:36:39 +0000 |
| commit | 0e01999b0bced7d784b4d617a1ca55c9451333e3 (patch) | |
| tree | a92700905f7c8521b35c2254d9b43b83e98f5eb3 | |
| parent | 8549e9c7bef3b08d0515c06346a9040e93165214 (diff) | |
| parent | d5cbc3a031cfe33f0f2505c6efabdb4ccd5d0e21 (diff) | |
| download | qemu-0e01999b0bced7d784b4d617a1ca55c9451333e3.tar.gz | |
Merge "Better support for openGLES 2.0 extensions" into studio-1.4-dev automerge: a9fc406
automerge: d5cbc3a
* commit 'd5cbc3a031cfe33f0f2505c6efabdb4ccd5d0e21':
Better support for openGLES 2.0 extensions
3 files changed, 16 insertions, 3 deletions
diff --git a/distrib/android-emugl/host/libs/Translator/GLES_V2/GLESv2Context.cpp b/distrib/android-emugl/host/libs/Translator/GLES_V2/GLESv2Context.cpp index 02c7276737..a49cefa465 100644 --- a/distrib/android-emugl/host/libs/Translator/GLES_V2/GLESv2Context.cpp +++ b/distrib/android-emugl/host/libs/Translator/GLES_V2/GLESv2Context.cpp @@ -155,9 +155,18 @@ void GLESv2Context::initExtensionString() { if (s_glSupport.GL_OES_STANDARD_DERIVATIVES) *s_glExtensions+="GL_OES_standard_derivatives "; if (s_glSupport.GL_OES_TEXTURE_NPOT) - *s_glExtensions+="GL_OES_texture_npot"; - if (s_glSupport.GL_OES_RGB8_RGBA8) { - *s_glExtensions+=" GL_OES_rgb8_rgba8"; + *s_glExtensions+="GL_OES_texture_npot "; + if (s_glSupport.GL_OES_RGB8_RGBA8) + *s_glExtensions+="GL_OES_rgb8_rgba8 "; + if (s_glSupport.GL_OES_READ_FORMAT) + *s_glExtensions+="GL_OES_read_format "; + if (s_glSupport.GL_EXT_TEXTURE_STORAGE) + *s_glExtensions+="GL_EXT_texture_storage "; + if (s_glSupport.GL_EXT_TEXTURE_FORMAT_BGRA8888) + *s_glExtensions+="GL_EXT_texture_format_BGRA8888 "; + if (s_glSupport.GL_EXT_FRAMEBUFFER_OBJECT) { + *s_glExtensions+="GL_OES_framebuffer_object GL_OES_depth24 GL_OES_depth32 GL_OES_fbo_render_mipmap " + "GL_OES_rgb8_rgba8 GL_OES_stencil1 GL_OES_stencil4 GL_OES_stencil8 "; } } diff --git a/distrib/android-emugl/host/libs/Translator/GLcommon/GLEScontext.cpp b/distrib/android-emugl/host/libs/Translator/GLcommon/GLEScontext.cpp index ab37ca97ed..d460de56ff 100644 --- a/distrib/android-emugl/host/libs/Translator/GLcommon/GLEScontext.cpp +++ b/distrib/android-emugl/host/libs/Translator/GLcommon/GLEScontext.cpp @@ -518,6 +518,9 @@ void GLEScontext::initCapsLocked(const GLubyte * extensionString) s_glSupport.glslVersion = Version((const char*)(glslVersion)); const GLubyte* glVersion = s_glDispatch.glGetString(GL_VERSION); + if (strstr(cstring,"GL_EXT_texture_storage ")!=NULL) + s_glSupport.GL_EXT_TEXTURE_STORAGE = true; + if (strstr(cstring,"GL_EXT_bgra ")!=NULL) s_glSupport.GL_EXT_TEXTURE_FORMAT_BGRA8888 = true; diff --git a/distrib/android-emugl/host/libs/Translator/include/GLcommon/GLEScontext.h b/distrib/android-emugl/host/libs/Translator/include/GLcommon/GLEScontext.h index d6c6105930..5621fbc108 100644 --- a/distrib/android-emugl/host/libs/Translator/include/GLcommon/GLEScontext.h +++ b/distrib/android-emugl/host/libs/Translator/include/GLcommon/GLEScontext.h @@ -83,6 +83,7 @@ struct GLSupport { bool GL_OES_STANDARD_DERIVATIVES; bool GL_OES_TEXTURE_NPOT; bool GL_OES_RGB8_RGBA8; + bool GL_EXT_TEXTURE_STORAGE; }; |