From 5f23fe21b29083922dab55feb33258f3f855ca9e Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 8 Dec 2015 21:48:20 +0300 Subject: Add nacl gl init and nacl defines and includes in most files. --- src/render/mgl.hpp | 46 ++++++++++++++++++++++++---------------------- 1 file changed, 24 insertions(+), 22 deletions(-) (limited to 'src/render/mgl.hpp') 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 -- cgit v1.2.3-70-g09d2