Fixed Windows-specific problem with locally generated function pointer

typedefs where the calling convention was not specified. Provided new
LocalProcAddressCallingConvention directive to allow developer to
specify the calling convention on a per-function basis; used this in
gl-es1.cfg and gl-es2.cfg. Changed GLEmitter to force the calling
convention of the locally typedefed function pointers for OpenGL
function name unification to GL_APIENTRY, compatible with OpenGL ES 1
and OpenGL ES 2. Changed generated native glue code to #define
GL_APIENTRY appropriately on the desktop. Refactored custom C code.


git-svn-id: file:///usr/local/projects/SUN/JOGL/git-svn/svn-server-sync/jogl/branches/JOGL_2_SANDBOX@1712 232f8b59-042b-4e1e-8c03-345bb8c30851

1 files changed, 145 insertions, 0 deletions

diff --git a/make/gl-es2.cfg b/make/gl-es2.cfg
index 74620253f..2fc3e7919 100755
--- a/make/gl-es2.cfg
+++ b/make/gl-es2.cfg
@@ -171,6 +171,151 @@ ForceProcAddressGen glVertexAttrib4fv
 ForceProcAddressGen glVertexAttribPointer
 ForceProcAddressGen glViewport
 
+# Also force the calling conventions of the locally generated function
+# pointer typedefs for these routines to GL_APIENTRY
+LocalProcAddressCallingConvention glActiveTexture GL_APIENTRY
+LocalProcAddressCallingConvention glAttachShader GL_APIENTRY
+LocalProcAddressCallingConvention glBindAttribLocation GL_APIENTRY
+LocalProcAddressCallingConvention glBindBuffer GL_APIENTRY
+LocalProcAddressCallingConvention glBindFramebuffer GL_APIENTRY
+LocalProcAddressCallingConvention glBindRenderbuffer GL_APIENTRY
+LocalProcAddressCallingConvention glBindTexture GL_APIENTRY
+LocalProcAddressCallingConvention glBlendColor GL_APIENTRY
+LocalProcAddressCallingConvention glBlendEquation GL_APIENTRY
+LocalProcAddressCallingConvention glBlendEquationSeparate GL_APIENTRY
+LocalProcAddressCallingConvention glBlendFunc GL_APIENTRY
+LocalProcAddressCallingConvention glBlendFuncSeparate GL_APIENTRY
+LocalProcAddressCallingConvention glBufferData GL_APIENTRY
+LocalProcAddressCallingConvention glBufferSubData GL_APIENTRY
+LocalProcAddressCallingConvention glCheckFramebufferStatus GL_APIENTRY
+LocalProcAddressCallingConvention glClear GL_APIENTRY
+LocalProcAddressCallingConvention glClearColor GL_APIENTRY
+LocalProcAddressCallingConvention glClearDepthf GL_APIENTRY
+LocalProcAddressCallingConvention glClearStencil GL_APIENTRY
+LocalProcAddressCallingConvention glColorMask GL_APIENTRY
+LocalProcAddressCallingConvention glCompileShader GL_APIENTRY
+LocalProcAddressCallingConvention glCompressedTexImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glCompressedTexSubImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glCopyTexImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glCopyTexSubImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glCreateProgram GL_APIENTRY
+LocalProcAddressCallingConvention glCreateShader GL_APIENTRY
+LocalProcAddressCallingConvention glCullFace GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteBuffers GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteFramebuffers GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteTextures GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteProgram GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteRenderbuffers GL_APIENTRY
+LocalProcAddressCallingConvention glDeleteShader GL_APIENTRY
+LocalProcAddressCallingConvention glDetachShader GL_APIENTRY
+LocalProcAddressCallingConvention glDepthFunc GL_APIENTRY
+LocalProcAddressCallingConvention glDepthMask GL_APIENTRY
+LocalProcAddressCallingConvention glDepthRangef GL_APIENTRY
+LocalProcAddressCallingConvention glDisable GL_APIENTRY
+LocalProcAddressCallingConvention glDisableVertexAttribArray GL_APIENTRY
+LocalProcAddressCallingConvention glDrawArrays GL_APIENTRY
+LocalProcAddressCallingConvention glDrawElements GL_APIENTRY
+LocalProcAddressCallingConvention glEnable GL_APIENTRY
+LocalProcAddressCallingConvention glEnableVertexAttribArray GL_APIENTRY
+LocalProcAddressCallingConvention glFinish GL_APIENTRY
+LocalProcAddressCallingConvention glFlush GL_APIENTRY
+LocalProcAddressCallingConvention glFramebufferRenderbuffer GL_APIENTRY
+LocalProcAddressCallingConvention glFramebufferTexture2D GL_APIENTRY
+LocalProcAddressCallingConvention glFrontFace GL_APIENTRY
+LocalProcAddressCallingConvention glGenBuffers GL_APIENTRY
+LocalProcAddressCallingConvention glGenerateMipmap GL_APIENTRY
+LocalProcAddressCallingConvention glGenFramebuffers GL_APIENTRY
+LocalProcAddressCallingConvention glGenRenderbuffers GL_APIENTRY
+LocalProcAddressCallingConvention glGenTextures GL_APIENTRY
+LocalProcAddressCallingConvention glGetActiveAttrib GL_APIENTRY
+LocalProcAddressCallingConvention glGetActiveUniform GL_APIENTRY
+LocalProcAddressCallingConvention glGetAttachedShaders GL_APIENTRY
+LocalProcAddressCallingConvention glGetAttribLocation GL_APIENTRY
+LocalProcAddressCallingConvention glGetBooleanv GL_APIENTRY
+LocalProcAddressCallingConvention glGetBufferParameteriv GL_APIENTRY
+LocalProcAddressCallingConvention glGetError GL_APIENTRY
+LocalProcAddressCallingConvention glGetFloatv GL_APIENTRY
+LocalProcAddressCallingConvention glGetFramebufferAttachmentParameteriv GL_APIENTRY
+LocalProcAddressCallingConvention glGetIntegerv GL_APIENTRY
+LocalProcAddressCallingConvention glGetProgramiv GL_APIENTRY
+LocalProcAddressCallingConvention glGetProgramInfoLog GL_APIENTRY
+LocalProcAddressCallingConvention glGetRenderbufferParameteriv GL_APIENTRY
+LocalProcAddressCallingConvention glGetShaderiv GL_APIENTRY
+LocalProcAddressCallingConvention glGetShaderInfoLog GL_APIENTRY
+LocalProcAddressCallingConvention glGetShaderPrecisionFormat GL_APIENTRY
+LocalProcAddressCallingConvention glGetShaderSource GL_APIENTRY
+LocalProcAddressCallingConvention glGetString GL_APIENTRY
+LocalProcAddressCallingConvention glGetTexParameterfv GL_APIENTRY
+LocalProcAddressCallingConvention glGetTexParameteriv GL_APIENTRY
+LocalProcAddressCallingConvention glGetUniformfv GL_APIENTRY
+LocalProcAddressCallingConvention glGetUniformiv GL_APIENTRY
+LocalProcAddressCallingConvention glGetUniformLocation GL_APIENTRY
+LocalProcAddressCallingConvention glGetVertexAttribfv GL_APIENTRY
+LocalProcAddressCallingConvention glGetVertexAttribiv GL_APIENTRY
+LocalProcAddressCallingConvention glGetVertexAttribPointerv GL_APIENTRY
+LocalProcAddressCallingConvention glHint GL_APIENTRY
+LocalProcAddressCallingConvention glIsBuffer GL_APIENTRY
+LocalProcAddressCallingConvention glIsEnabled GL_APIENTRY
+LocalProcAddressCallingConvention glIsFramebuffer GL_APIENTRY
+LocalProcAddressCallingConvention glIsProgram GL_APIENTRY
+LocalProcAddressCallingConvention glIsRenderbuffer GL_APIENTRY
+LocalProcAddressCallingConvention glIsShader GL_APIENTRY
+LocalProcAddressCallingConvention glIsTexture GL_APIENTRY
+LocalProcAddressCallingConvention glLineWidth GL_APIENTRY
+LocalProcAddressCallingConvention glLinkProgram GL_APIENTRY
+LocalProcAddressCallingConvention glPixelStorei GL_APIENTRY
+LocalProcAddressCallingConvention glPolygonOffset GL_APIENTRY
+LocalProcAddressCallingConvention glReadPixels GL_APIENTRY
+LocalProcAddressCallingConvention glReleaseShaderCompiler GL_APIENTRY
+LocalProcAddressCallingConvention glRenderbufferStorage GL_APIENTRY
+LocalProcAddressCallingConvention glSampleCoverage GL_APIENTRY
+LocalProcAddressCallingConvention glScissor GL_APIENTRY
+LocalProcAddressCallingConvention glShaderBinary GL_APIENTRY
+LocalProcAddressCallingConvention glShaderSource GL_APIENTRY
+LocalProcAddressCallingConvention glStencilFunc GL_APIENTRY
+LocalProcAddressCallingConvention glStencilFuncSeparate GL_APIENTRY
+LocalProcAddressCallingConvention glStencilMask GL_APIENTRY
+LocalProcAddressCallingConvention glStencilMaskSeparate GL_APIENTRY
+LocalProcAddressCallingConvention glStencilOp GL_APIENTRY
+LocalProcAddressCallingConvention glStencilOpSeparate GL_APIENTRY
+LocalProcAddressCallingConvention glTexImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glTexParameterf GL_APIENTRY
+LocalProcAddressCallingConvention glTexParameterfv GL_APIENTRY
+LocalProcAddressCallingConvention glTexParameteri GL_APIENTRY
+LocalProcAddressCallingConvention glTexParameteriv GL_APIENTRY
+LocalProcAddressCallingConvention glTexSubImage2D GL_APIENTRY
+LocalProcAddressCallingConvention glUniform1f GL_APIENTRY
+LocalProcAddressCallingConvention glUniform1fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform1i GL_APIENTRY
+LocalProcAddressCallingConvention glUniform1iv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform2f GL_APIENTRY
+LocalProcAddressCallingConvention glUniform2fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform2i GL_APIENTRY
+LocalProcAddressCallingConvention glUniform2iv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform3f GL_APIENTRY
+LocalProcAddressCallingConvention glUniform3fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform3i GL_APIENTRY
+LocalProcAddressCallingConvention glUniform3iv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform4f GL_APIENTRY
+LocalProcAddressCallingConvention glUniform4fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniform4i GL_APIENTRY
+LocalProcAddressCallingConvention glUniform4iv GL_APIENTRY
+LocalProcAddressCallingConvention glUniformMatrix2fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniformMatrix3fv GL_APIENTRY
+LocalProcAddressCallingConvention glUniformMatrix4fv GL_APIENTRY
+LocalProcAddressCallingConvention glUseProgram GL_APIENTRY
+LocalProcAddressCallingConvention glValidateProgram GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib1f GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib1fv GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib2f GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib2fv GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib3f GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib3fv GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib4f GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttrib4fv GL_APIENTRY
+LocalProcAddressCallingConvention glVertexAttribPointer GL_APIENTRY
+LocalProcAddressCallingConvention glViewport GL_APIENTRY
+
 # Pick up on-line OpenGL javadoc thanks to user cylab on javagaming.org forums
 TagNativeBinding true