diff options
| author | bohu <bohu@google.com> | 2014-12-11 16:53:07 -0800 |
|---|---|---|
| committer | bohu <bohu@google.com> | 2014-12-11 16:53:07 -0800 |
| commit | dcbf442176f0e4e3e532c135800c06ba56a17f20 (patch) | |
| tree | 6045c21061b95615ca56fa0b7c2c9d0fb0f85dd8 /opengl | |
| parent | 5f23bd4a95e854a2a7f01ddbda17bb858873ad44 (diff) | |
| download | android_device_generic_goldfish-dcbf442176f0e4e3e532c135800c06ba56a17f20.tar.gz android_device_generic_goldfish-dcbf442176f0e4e3e532c135800c06ba56a17f20.tar.bz2 android_device_generic_goldfish-dcbf442176f0e4e3e532c135800c06ba56a17f20.zip | |
Add shader version to glGetString
When querry shader version, current implementation returns
null. This commit fixes it.
Change-Id: If9b7c0ba3bb2bc48d0b7404529254834fff6ee5c
Diffstat (limited to 'opengl')
| -rw-r--r-- | opengl/system/egl/egl.cpp | 6 | ||||
| -rw-r--r-- | opengl/system/egl/eglContext.h | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/opengl/system/egl/egl.cpp b/opengl/system/egl/egl.cpp index 8499229..86897d4 100644 --- a/opengl/system/egl/egl.cpp +++ b/opengl/system/egl/egl.cpp @@ -140,6 +140,7 @@ EGLContext_t::EGLContext_t(EGLDisplay dpy, EGLConfig config, EGLContext_t* share versionString(NULL), vendorString(NULL), rendererString(NULL), + shaderVersionString(NULL), extensionString(NULL), deletePending(0) { @@ -158,6 +159,7 @@ EGLContext_t::~EGLContext_t() delete [] versionString; delete [] vendorString; delete [] rendererString; + delete [] shaderVersionString; delete [] extensionString; } @@ -416,6 +418,7 @@ static const char *getGLString(int glEnum) #define GL_VENDOR 0x1F00 #define GL_RENDERER 0x1F01 #define GL_VERSION 0x1F02 +#define GL_SHADING_LANGUAGE_VERSION 0x8B8C #define GL_EXTENSIONS 0x1F03 switch(glEnum) { @@ -428,6 +431,9 @@ static const char *getGLString(int glEnum) case GL_RENDERER: strPtr = &tInfo->currentContext->rendererString; break; + case GL_SHADING_LANGUAGE_VERSION: + strPtr = &tInfo->currentContext->shaderVersionString; + break; case GL_EXTENSIONS: strPtr = &tInfo->currentContext->extensionString; break; diff --git a/opengl/system/egl/eglContext.h b/opengl/system/egl/eglContext.h index 16a2780..5b6a428 100644 --- a/opengl/system/egl/eglContext.h +++ b/opengl/system/egl/eglContext.h @@ -39,6 +39,7 @@ struct EGLContext_t { const char* versionString; const char* vendorString; const char* rendererString; + const char* shaderVersionString; const char* extensionString; EGLint deletePending; GLClientState * getClientState(){ return clientState; } |