diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-12-08 21:48:20 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-12-11 18:15:54 +0300 |
commit | 5f23fe21b29083922dab55feb33258f3f855ca9e (patch) | |
tree | 09637f98663093435066a6436b931612c4a53d82 /src/render/mgl.hpp | |
parent | 167fe73b9dde166cc84927262cdd8c20ed2f4ac4 (diff) | |
download | plus-5f23fe21b29083922dab55feb33258f3f855ca9e.tar.gz plus-5f23fe21b29083922dab55feb33258f3f855ca9e.tar.bz2 plus-5f23fe21b29083922dab55feb33258f3f855ca9e.tar.xz plus-5f23fe21b29083922dab55feb33258f3f855ca9e.zip |
Add nacl gl init and nacl defines and includes in most files.
Diffstat (limited to 'src/render/mgl.hpp')
-rw-r--r-- | src/render/mgl.hpp | 46 |
1 files changed, 24 insertions, 22 deletions
diff --git a/src/render/mgl.hpp b/src/render/mgl.hpp index 118b9491c..0370cde74 100644 --- a/src/render/mgl.hpp +++ b/src/render/mgl.hpp @@ -43,39 +43,43 @@ defName(glPopGroupMarker); defName(glGenVertexArrays); defName(glBindVertexArray); defName(glDeleteVertexArrays); -defName(glVertexAttribPointer); -defName(glEnableVertexAttribArray); defName(glDisableVertexAttribArray); -defName(glGenBuffers); -defName(glDeleteBuffers); -defName(glBindBuffer); -defName(glBufferData); -defName(glCreateShader); defName(glDeleteShader); -defName(glGetShaderiv); defName(glGetShaderInfoLog); defName(glGetShaderSource); -defName(glShaderSource); -defName(glCompileShader); -defName(glLinkProgram); -defName(glDeleteProgram); -defName(glCreateProgram); -defName(glAttachShader); defName(glDetachShader); defName(glGetAttachedShaders); -defName(glGetUniformLocation); defName(glGetActiveUniform); -defName(glGetProgramiv); defName(glBindFragDataLocation); +#ifndef __native_client__ +defName(glDeleteProgram); +defName(glCreateProgram); +defName(glGetProgramiv); +defName(glLinkProgram); +defName(glAttachShader); +defName(glGetShaderiv); +defName(glCompileShader); +defName(glShaderSource); +defName(glCreateShader); +defName(glGetUniformLocation); +defName(glGenBuffers); +defName(glDeleteBuffers); +defName(glBindBuffer); +defName(glBufferData); +defName(glEnableVertexAttribArray); +defName(glVertexAttribPointer); defName(glUseProgram); -defName(glValidateProgram); -defName(glGetAttribLocation); defName(glUniform1f); defName(glUniform2f); -defName(glUniform3f); defName(glUniform4f); -defName(glCheckFramebufferStatus); +defName(glValidateProgram); defName(glGetProgramInfoLog); +defName(glBindAttribLocation); +defName(glActiveTexture); +#endif +defName(glGetAttribLocation); +defName(glUniform3f); +defName(glCheckFramebufferStatus); defName(glProgramUniform1f); defName(glProgramUniform2f); defName(glProgramUniform3f); @@ -102,8 +106,6 @@ defName(glGetQueryObjectui64v); defName(glTextureSubImage2D); defName(glClearTexImage); defName(glClearTexSubImage); -defName(glBindAttribLocation); -defName(glActiveTexture); #ifdef WIN32 defName(wglGetExtensionsString); #endif |