diff options
| author | David Turner <digit@google.com> | 2015-03-27 16:50:05 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-27 16:50:05 +0000 |
| commit | 9af76c29413fb56887f74ef5a6969b0f90741a8d (patch) | |
| tree | f5e109a5c47be67dc49b4ba7106fde4536482198 /opengl | |
| parent | b729e76af3a1d3d1ddd94cad73ac4f7374bcb5aa (diff) | |
| parent | 9cf8ded9783bbd05f8c4b3454164af4b5782a262 (diff) | |
| download | android_device_generic_goldfish-9af76c29413fb56887f74ef5a6969b0f90741a8d.tar.gz android_device_generic_goldfish-9af76c29413fb56887f74ef5a6969b0f90741a8d.tar.bz2 android_device_generic_goldfish-9af76c29413fb56887f74ef5a6969b0f90741a8d.zip | |
am 9cf8ded9: am 2b763c9f: Merge "Checking parameters for glCreateShader in guest"
* commit '9cf8ded9783bbd05f8c4b3454164af4b5782a262':
Checking parameters for glCreateShader in guest
Diffstat (limited to 'opengl')
| -rwxr-xr-x | opengl/system/GLESv2_enc/GL2Encoder.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/opengl/system/GLESv2_enc/GL2Encoder.cpp b/opengl/system/GLESv2_enc/GL2Encoder.cpp index 18c796e..dca504d 100755 --- a/opengl/system/GLESv2_enc/GL2Encoder.cpp +++ b/opengl/system/GLESv2_enc/GL2Encoder.cpp @@ -765,6 +765,8 @@ GLuint GL2Encoder::s_glCreateProgram(void * self) GLuint GL2Encoder::s_glCreateShader(void *self, GLenum shaderType) { GL2Encoder *ctx = (GL2Encoder*)self; + RET_AND_SET_ERROR_IF(((shaderType != GL_VERTEX_SHADER) && (shaderType != GL_FRAGMENT_SHADER)), + GL_INVALID_ENUM, 0); GLuint shader = ctx->m_glCreateShader_enc(self, shaderType); if (shader != 0) { if (!ctx->m_shared->addShaderData(shader)) { |