Skip to content

Commit

Permalink
Merge pull request emscripten-core#4070 from rdb/patch-1
Browse files Browse the repository at this point in the history
Fix GL_SHADING_LANGUAGE_VERSION
  • Loading branch information
kripken committed Feb 2, 2016
2 parents ea38f63 + f90699c commit 82983e0
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/library_gl.js
Original file line number Diff line number Diff line change
Expand Up @@ -730,9 +730,9 @@ var LibraryGL = {
case 0x8B8C /* GL_SHADING_LANGUAGE_VERSION */:
var glslVersion = GLctx.getParameter(GLctx.SHADING_LANGUAGE_VERSION);
// Map WebGL GL_SHADING_LANGUAGE_VERSION string format to GLES format.
if (glslVersion.indexOf('WebGL GLSL ES 1.0') != -1) glslVersion = 'OpenGL ES GLSL 1.00 (WebGL)';
if (glslVersion.indexOf('WebGL GLSL ES 1.0') != -1) glslVersion = 'OpenGL ES GLSL ES 1.00 (WebGL)';
#if USE_WEBGL2
else if (glslVersion.indexOf('WebGL GLSL ES 3.00') != -1) glslVersion = 'OpenGL ES GLSL 3.00 (WebGL 2)';
else if (glslVersion.indexOf('WebGL GLSL ES 3.00') != -1) glslVersion = 'OpenGL ES GLSL ES 3.00 (WebGL 2)';
#endif
ret = allocate(intArrayFromString(glslVersion), 'i8', ALLOC_NORMAL);
break;
Expand Down

0 comments on commit 82983e0

Please sign in to comment.