Skip to content

Fix GL_SHADING_LANGUAGE_VERSION#4070

Merged
kripken merged 1 commit intoemscripten-core:incomingfrom
rdb:patch-1
Feb 2, 2016
Merged

Fix GL_SHADING_LANGUAGE_VERSION#4070
kripken merged 1 commit intoemscripten-core:incomingfrom
rdb:patch-1

Conversation

@rdb
Copy link
Copy Markdown
Contributor

@rdb rdb commented Feb 2, 2016

OpenGL ES 2 specification section 6.1.5 and OpenGL ES 3 specification section 6.1.6 state:

The SHADING_LANGUAGE_VERSION string is laid out as follows:
"OpenGL ES GLSL ES N.M vendor-specific information"

Emscripten misses the second "ES" in there. This tripped up our engine, which expects a conforming string. This patch fixes that.

Fix the value of the GL_SHADING_LANGUAGE_VERSION string to conform to the OpenGL ES 2 and 3 specifications (sections 6.1.5/6.1.6 resp.)
rdb added a commit to panda3d/panda3d that referenced this pull request Feb 2, 2016
@juj juj added the GL label Feb 2, 2016
@juj
Copy link
Copy Markdown
Collaborator

juj commented Feb 2, 2016

Thanks, this looks good!

Can you add a commit in this PR that adds your name in AUTHORS?

@rdb
Copy link
Copy Markdown
Contributor Author

rdb commented Feb 2, 2016

My name already is in AUTHORS.

kripken added a commit that referenced this pull request Feb 2, 2016
Fix GL_SHADING_LANGUAGE_VERSION
@kripken kripken merged commit 82983e0 into emscripten-core:incoming Feb 2, 2016
@kripken
Copy link
Copy Markdown
Member

kripken commented Feb 2, 2016

Nice. Merged, thanks again!

@rdb rdb deleted the patch-1 branch February 2, 2016 22:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants