diff options
| author | David 'Digit' Turner <digit@google.com> | 2014-04-17 12:12:46 +0200 |
|---|---|---|
| committer | David 'Digit' Turner <digit@google.com> | 2014-04-17 12:12:46 +0200 |
| commit | 2a4aa00b0f579a3be0e8449914e65c9329253611 (patch) | |
| tree | 4eeec415f485774bbe84d7267c6f040333a90ea4 /emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | |
| parent | 3630e36f8fe89f59f464807828c55d37424dbcfa (diff) | |
| download | sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.zip sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.tar.gz sdk-2a4aa00b0f579a3be0e8449914e65c9329253611.tar.bz2 | |
emulator/opengl: Backport fixes from master branch.
This back-ports several fixes from aosp/master branch into idea133:
145e25 Fix the Google Maps crash issue
e33909 Support GL_MAX_TEXTURE_SIZE case to glGetIntegerv API
c6dd20 Fix Mac build.
Change-Id: I26a05956c3b926dddeb638c6cff979199075ecbb
Diffstat (limited to 'emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp')
| -rw-r--r-- | emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp index c0519c4..ba3edbe 100644 --- a/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp +++ b/emulator/opengl/host/libs/Translator/GLcommon/GLEScontext.cpp @@ -677,6 +677,10 @@ bool GLEScontext::glGetIntegerv(GLenum pname, GLint *params) case GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES: *params = GL_RGBA; break; + + case GL_MAX_TEXTURE_SIZE: + *params = getMaxTexSize(); + break; default: return false; } |