Skip to content

A
angle
Commit c5898044 by Clemen Deng Committed by Commit Bot
Options

Don't remove GL commands that are duplicates of GLES commands

in openGL32 proc table Bug: angleproject:3652 Change-Id: I014fab19564972bc3bc27f733534fd3630af41b9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/1688497 Commit-Queue: Clemen Deng <clemendeng@google.com> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent 524a8c90
Showing with 285 additions and 22 deletions
scripts/gen_proc_table.py
...@@ -12,7 +12,7 @@ from datetime import date ...@@ -12,7 +12,7 @@ from datetime import date
import registry_xml import registry_xml
out_file_name_gles = "../src/libGLESv2/proc_table_egl_autogen.cpp" out_file_name_gles = "../src/libGLESv2/proc_table_egl_autogen.cpp"
out_file_name_wgl = "../src/openGL32/proc_table_wgl_autogen.cpp" out_file_name_gl = "../src/openGL32/proc_table_wgl_autogen.cpp"
# The EGL_ANGLE_explicit_context extension is generated differently from other extensions. # The EGL_ANGLE_explicit_context extension is generated differently from other extensions.
# Toggle generation here. # Toggle generation here.
...@@ -57,7 +57,7 @@ includes_gles = """#include "libGLESv2/proc_table_egl.h" ...@@ -57,7 +57,7 @@ includes_gles = """#include "libGLESv2/proc_table_egl.h"
#include "platform/Platform.h" #include "platform/Platform.h"
""" """
includes_wgl = """#include "openGL32/proc_table_wgl.h" includes_gl = """#include "openGL32/proc_table_wgl.h"
#include "openGL32/entry_points_wgl.h" #include "openGL32/entry_points_wgl.h"
#include "openGL32/entry_points_gl_1_0_autogen.h" #include "openGL32/entry_points_gl_1_0_autogen.h"
...@@ -82,7 +82,7 @@ def main(): ...@@ -82,7 +82,7 @@ def main():
# auto_script parameters. # auto_script parameters.
if len(sys.argv) > 1: if len(sys.argv) > 1:
inputs = [source for source in registry_xml.xml_inputs] inputs = [source for source in registry_xml.xml_inputs]
outputs = [out_file_name_gles, out_file_name_wgl] outputs = [out_file_name_gles, out_file_name_gl]
if sys.argv[1] == 'inputs': if sys.argv[1] == 'inputs':
print ','.join(inputs) print ','.join(inputs)
elif sys.argv[1] == 'outputs': elif sys.argv[1] == 'outputs':
...@@ -94,10 +94,6 @@ def main(): ...@@ -94,10 +94,6 @@ def main():
glesxml = registry_xml.RegistryXML('gl.xml', 'gl_angle_ext.xml') glesxml = registry_xml.RegistryXML('gl.xml', 'gl_angle_ext.xml')
# Track the GLES commands so we don't add them to wgl proc table
gles_commands = []
gles_commands = []
for annotation in ["2_0", "3_0", "3_1", "1_0"]: for annotation in ["2_0", "3_0", "3_1", "1_0"]:
name_prefix = "GL_ES_VERSION_" name_prefix = "GL_ES_VERSION_"
...@@ -106,11 +102,9 @@ def main(): ...@@ -106,11 +102,9 @@ def main():
feature_name = "{}{}".format(name_prefix, annotation) feature_name = "{}{}".format(name_prefix, annotation)
glesxml.AddCommands(feature_name, annotation) glesxml.AddCommands(feature_name, annotation)
gles_commands.extend(glesxml.commands[annotation])
glesxml.AddExtensionCommands(registry_xml.supported_extensions, ['gles2', 'gles1']) glesxml.AddExtensionCommands(registry_xml.supported_extensions, ['gles2', 'gles1'])
# Also don't add GLES extension commands to wgl proc table # Also don't add GLES extension commands to libGL proc table
extension_commands = [] extension_commands = []
for extension_name, ext_cmd_names in sorted(glesxml.ext_data.iteritems()): for extension_name, ext_cmd_names in sorted(glesxml.ext_data.iteritems()):
extension_commands.extend(glesxml.ext_data[extension_name]) extension_commands.extend(glesxml.ext_data[extension_name])
...@@ -119,7 +113,6 @@ def main(): ...@@ -119,7 +113,6 @@ def main():
for suffix in strip_suffixes: for suffix in strip_suffixes:
if name_no_suffix.endswith(suffix): if name_no_suffix.endswith(suffix):
name_no_suffix = name_no_suffix[0:-len(suffix)] name_no_suffix = name_no_suffix[0:-len(suffix)]
gles_commands.append(name_no_suffix)
gles_data = glesxml.all_cmd_names.get_all_commands() gles_data = glesxml.all_cmd_names.get_all_commands()
...@@ -167,7 +160,7 @@ def main(): ...@@ -167,7 +160,7 @@ def main():
out_file.write(output_cpp) out_file.write(output_cpp)
out_file.close() out_file.close()
# WGL proc table # libGL proc table
glxml = registry_xml.RegistryXML('gl.xml') glxml = registry_xml.RegistryXML('gl.xml')
for annotation in ["1_0", "1_1", "1_2", "1_3", "1_4", "1_5", "2_0", "2_1", "3_0", "3_1"]: for annotation in ["1_0", "1_1", "1_2", "1_3", "1_4", "1_5", "2_0", "2_1", "3_0", "3_1"]:
...@@ -176,7 +169,7 @@ def main(): ...@@ -176,7 +169,7 @@ def main():
feature_name = "{}{}".format(name_prefix, annotation) feature_name = "{}{}".format(name_prefix, annotation)
glxml.AddCommands(feature_name, annotation) glxml.AddCommands(feature_name, annotation)
wgl_data = [cmd for cmd in glxml.all_cmd_names.get_all_commands() if cmd not in gles_commands] gl_data = [cmd for cmd in glxml.all_cmd_names.get_all_commands()]
wglxml = registry_xml.RegistryXML('wgl.xml') wglxml = registry_xml.RegistryXML('wgl.xml')
...@@ -186,12 +179,12 @@ def main(): ...@@ -186,12 +179,12 @@ def main():
feature_name = "{}{}".format(name_prefix, annotation) feature_name = "{}{}".format(name_prefix, annotation)
wglxml.AddCommands(feature_name, annotation) wglxml.AddCommands(feature_name, annotation)
wgl_commands = wglxml.all_cmd_names.get_all_commands() gl_commands = wglxml.all_cmd_names.get_all_commands()
wgl_data.extend([cmd if cmd[:3] == 'wgl' else 'wgl' + cmd for cmd in wgl_commands]) gl_data.extend([cmd if cmd[:3] == 'wgl' else 'wgl' + cmd for cmd in gl_commands])
all_functions = {} all_functions = {}
for function in wgl_data: for function in gl_data:
if function.startswith("gl"): if function.startswith("gl"):
all_functions[function] = "gl::" + function[2:] all_functions[function] = "gl::" + function[2:]
else: else:
...@@ -200,12 +193,12 @@ def main(): ...@@ -200,12 +193,12 @@ def main():
proc_data = [(' {"%s", P(%s)}' % (func, angle_func)) proc_data = [(' {"%s", P(%s)}' % (func, angle_func))
for func, angle_func in sorted(all_functions.iteritems())] for func, angle_func in sorted(all_functions.iteritems())]
with open(out_file_name_wgl, 'w') as out_file: with open(out_file_name_gl, 'w') as out_file:
output_cpp = template_cpp.format( output_cpp = template_cpp.format(
script_name=sys.argv[0], script_name=sys.argv[0],
data_source_name="gl.xml, wgl.xml", data_source_name="gl.xml, wgl.xml",
copyright_year=date.today().year, copyright_year=date.today().year,
includes=includes_wgl, includes=includes_gl,
cast="PROC", cast="PROC",
namespace="wgl", namespace="wgl",
proc_data=",\n".join(proc_data), proc_data=",\n".join(proc_data),
......
scripts/run_code_generation_hashes.json
...@@ -544,7 +544,7 @@ ...@@ -544,7 +544,7 @@
"proc table:scripts/egl_angle_ext.xml": "proc table:scripts/egl_angle_ext.xml":
"fc2e249239fb1365f6d145cdf1a3cfcf", "fc2e249239fb1365f6d145cdf1a3cfcf",
"proc table:scripts/gen_proc_table.py": "proc table:scripts/gen_proc_table.py":
"445b0784415ea3808ddd276af7a5d775", "b41bdf1c5dacfba6089a66b903ea6d13",
"proc table:scripts/gl.xml": "proc table:scripts/gl.xml":
"b470cb06b06cbbe7adb2c8129ec85708", "b470cb06b06cbbe7adb2c8129ec85708",
"proc table:scripts/gl_angle_ext.xml": "proc table:scripts/gl_angle_ext.xml":
...@@ -556,7 +556,7 @@ ...@@ -556,7 +556,7 @@
"proc table:src/libGLESv2/proc_table_egl_autogen.cpp": "proc table:src/libGLESv2/proc_table_egl_autogen.cpp":
"6ab624dce9ebcdeaea091b27d98ed1ce", "6ab624dce9ebcdeaea091b27d98ed1ce",
"proc table:src/openGL32/proc_table_wgl_autogen.cpp": "proc table:src/openGL32/proc_table_wgl_autogen.cpp":
"5e872d3b18d35da12b103bc56dbc121c", "cadecfe9956fc200c643b635b425c15a",
"uniform type:src/common/gen_uniform_type_table.py": "uniform type:src/common/gen_uniform_type_table.py":
"a741cc301b1617ab0e4d29b35f1d3b96", "a741cc301b1617ab0e4d29b35f1d3b96",
"uniform type:src/common/uniform_type_info_autogen.cpp": "uniform type:src/common/uniform_type_info_autogen.cpp":
......
src/openGL32/proc_table_wgl_autogen.cpp
...@@ -28,18 +28,50 @@ ...@@ -28,18 +28,50 @@
namespace wgl namespace wgl
{ {
ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ProcEntry g_procTable[] = {
{"glAccum", P(gl::Accum)},
{"glActiveTexture", P(gl::ActiveTexture)},
{"glAlphaFunc", P(gl::AlphaFunc)},
{"glAreTexturesResident", P(gl::AreTexturesResident)}, {"glAreTexturesResident", P(gl::AreTexturesResident)},
{"glArrayElement", P(gl::ArrayElement)}, {"glArrayElement", P(gl::ArrayElement)},
{"glAttachShader", P(gl::AttachShader)},
{"glBegin", P(gl::Begin)}, {"glBegin", P(gl::Begin)},
{"glBeginConditionalRender", P(gl::BeginConditionalRender)}, {"glBeginConditionalRender", P(gl::BeginConditionalRender)},
{"glBeginQuery", P(gl::BeginQuery)},
{"glBeginTransformFeedback", P(gl::BeginTransformFeedback)},
{"glBindAttribLocation", P(gl::BindAttribLocation)},
{"glBindBuffer", P(gl::BindBuffer)},
{"glBindBufferBase", P(gl::BindBufferBase)},
{"glBindBufferRange", P(gl::BindBufferRange)},
{"glBindFragDataLocation", P(gl::BindFragDataLocation)},
{"glBindFramebuffer", P(gl::BindFramebuffer)},
{"glBindRenderbuffer", P(gl::BindRenderbuffer)},
{"glBindTexture", P(gl::BindTexture)},
{"glBindVertexArray", P(gl::BindVertexArray)},
{"glBitmap", P(gl::Bitmap)}, {"glBitmap", P(gl::Bitmap)},
{"glBlendColor", P(gl::BlendColor)},
{"glBlendEquation", P(gl::BlendEquation)},
{"glBlendEquationSeparate", P(gl::BlendEquationSeparate)},
{"glBlendFunc", P(gl::BlendFunc)},
{"glBlendFuncSeparate", P(gl::BlendFuncSeparate)},
{"glBlitFramebuffer", P(gl::BlitFramebuffer)},
{"glBufferData", P(gl::BufferData)},
{"glBufferSubData", P(gl::BufferSubData)},
{"glCallList", P(gl::CallList)}, {"glCallList", P(gl::CallList)},
{"glCallLists", P(gl::CallLists)}, {"glCallLists", P(gl::CallLists)},
{"glCheckFramebufferStatus", P(gl::CheckFramebufferStatus)},
{"glClampColor", P(gl::ClampColor)}, {"glClampColor", P(gl::ClampColor)},
{"glClear", P(gl::Clear)},
{"glClearAccum", P(gl::ClearAccum)}, {"glClearAccum", P(gl::ClearAccum)},
{"glClearBufferfi", P(gl::ClearBufferfi)},
{"glClearBufferfv", P(gl::ClearBufferfv)},
{"glClearBufferiv", P(gl::ClearBufferiv)},
{"glClearBufferuiv", P(gl::ClearBufferuiv)},
{"glClearColor", P(gl::ClearColor)},
{"glClearDepth", P(gl::ClearDepth)}, {"glClearDepth", P(gl::ClearDepth)},
{"glClearIndex", P(gl::ClearIndex)}, {"glClearIndex", P(gl::ClearIndex)},
{"glClearStencil", P(gl::ClearStencil)},
{"glClientActiveTexture", P(gl::ClientActiveTexture)},
{"glClipPlane", P(gl::ClipPlane)}, {"glClipPlane", P(gl::ClipPlane)},
{"glColor3b", P(gl::Color3b)}, {"glColor3b", P(gl::Color3b)},
{"glColor3bv", P(gl::Color3bv)}, {"glColor3bv", P(gl::Color3bv)},
...@@ -61,35 +93,76 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -61,35 +93,76 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glColor4bv", P(gl::Color4bv)}, {"glColor4bv", P(gl::Color4bv)},
{"glColor4d", P(gl::Color4d)}, {"glColor4d", P(gl::Color4d)},
{"glColor4dv", P(gl::Color4dv)}, {"glColor4dv", P(gl::Color4dv)},
{"glColor4f", P(gl::Color4f)},
{"glColor4fv", P(gl::Color4fv)}, {"glColor4fv", P(gl::Color4fv)},
{"glColor4i", P(gl::Color4i)}, {"glColor4i", P(gl::Color4i)},
{"glColor4iv", P(gl::Color4iv)}, {"glColor4iv", P(gl::Color4iv)},
{"glColor4s", P(gl::Color4s)}, {"glColor4s", P(gl::Color4s)},
{"glColor4sv", P(gl::Color4sv)}, {"glColor4sv", P(gl::Color4sv)},
{"glColor4ub", P(gl::Color4ub)},
{"glColor4ubv", P(gl::Color4ubv)}, {"glColor4ubv", P(gl::Color4ubv)},
{"glColor4ui", P(gl::Color4ui)}, {"glColor4ui", P(gl::Color4ui)},
{"glColor4uiv", P(gl::Color4uiv)}, {"glColor4uiv", P(gl::Color4uiv)},
{"glColor4us", P(gl::Color4us)}, {"glColor4us", P(gl::Color4us)},
{"glColor4usv", P(gl::Color4usv)}, {"glColor4usv", P(gl::Color4usv)},
{"glColorMask", P(gl::ColorMask)},
{"glColorMaski", P(gl::ColorMaski)}, {"glColorMaski", P(gl::ColorMaski)},
{"glColorMaterial", P(gl::ColorMaterial)}, {"glColorMaterial", P(gl::ColorMaterial)},
{"glColorPointer", P(gl::ColorPointer)},
{"glCompileShader", P(gl::CompileShader)},
{"glCompressedTexImage1D", P(gl::CompressedTexImage1D)}, {"glCompressedTexImage1D", P(gl::CompressedTexImage1D)},
{"glCompressedTexImage2D", P(gl::CompressedTexImage2D)},
{"glCompressedTexImage3D", P(gl::CompressedTexImage3D)},
{"glCompressedTexSubImage1D", P(gl::CompressedTexSubImage1D)}, {"glCompressedTexSubImage1D", P(gl::CompressedTexSubImage1D)},
{"glCompressedTexSubImage2D", P(gl::CompressedTexSubImage2D)},
{"glCompressedTexSubImage3D", P(gl::CompressedTexSubImage3D)},
{"glCopyBufferSubData", P(gl::CopyBufferSubData)},
{"glCopyPixels", P(gl::CopyPixels)}, {"glCopyPixels", P(gl::CopyPixels)},
{"glCopyTexImage1D", P(gl::CopyTexImage1D)}, {"glCopyTexImage1D", P(gl::CopyTexImage1D)},
{"glCopyTexImage2D", P(gl::CopyTexImage2D)},
{"glCopyTexSubImage1D", P(gl::CopyTexSubImage1D)}, {"glCopyTexSubImage1D", P(gl::CopyTexSubImage1D)},
{"glCopyTexSubImage2D", P(gl::CopyTexSubImage2D)},
{"glCopyTexSubImage3D", P(gl::CopyTexSubImage3D)},
{"glCreateProgram", P(gl::CreateProgram)},
{"glCreateShader", P(gl::CreateShader)},
{"glCullFace", P(gl::CullFace)},
{"glDeleteBuffers", P(gl::DeleteBuffers)},
{"glDeleteFramebuffers", P(gl::DeleteFramebuffers)},
{"glDeleteLists", P(gl::DeleteLists)}, {"glDeleteLists", P(gl::DeleteLists)},
{"glDeleteProgram", P(gl::DeleteProgram)},
{"glDeleteQueries", P(gl::DeleteQueries)},
{"glDeleteRenderbuffers", P(gl::DeleteRenderbuffers)},
{"glDeleteShader", P(gl::DeleteShader)},
{"glDeleteTextures", P(gl::DeleteTextures)},
{"glDeleteVertexArrays", P(gl::DeleteVertexArrays)},
{"glDepthFunc", P(gl::DepthFunc)},
{"glDepthMask", P(gl::DepthMask)},
{"glDepthRange", P(gl::DepthRange)}, {"glDepthRange", P(gl::DepthRange)},
{"glDetachShader", P(gl::DetachShader)},
{"glDisable", P(gl::Disable)},
{"glDisableClientState", P(gl::DisableClientState)},
{"glDisableVertexAttribArray", P(gl::DisableVertexAttribArray)},
{"glDisablei", P(gl::Disablei)}, {"glDisablei", P(gl::Disablei)},
{"glDrawArrays", P(gl::DrawArrays)},
{"glDrawArraysInstanced", P(gl::DrawArraysInstanced)},
{"glDrawBuffer", P(gl::DrawBuffer)}, {"glDrawBuffer", P(gl::DrawBuffer)},
{"glDrawBuffers", P(gl::DrawBuffers)},
{"glDrawElements", P(gl::DrawElements)},
{"glDrawElementsInstanced", P(gl::DrawElementsInstanced)},
{"glDrawPixels", P(gl::DrawPixels)}, {"glDrawPixels", P(gl::DrawPixels)},
{"glDrawRangeElements", P(gl::DrawRangeElements)},
{"glEdgeFlag", P(gl::EdgeFlag)}, {"glEdgeFlag", P(gl::EdgeFlag)},
{"glEdgeFlagPointer", P(gl::EdgeFlagPointer)}, {"glEdgeFlagPointer", P(gl::EdgeFlagPointer)},
{"glEdgeFlagv", P(gl::EdgeFlagv)}, {"glEdgeFlagv", P(gl::EdgeFlagv)},
{"glEnable", P(gl::Enable)},
{"glEnableClientState", P(gl::EnableClientState)},
{"glEnableVertexAttribArray", P(gl::EnableVertexAttribArray)},
{"glEnablei", P(gl::Enablei)}, {"glEnablei", P(gl::Enablei)},
{"glEnd", P(gl::End)}, {"glEnd", P(gl::End)},
{"glEndConditionalRender", P(gl::EndConditionalRender)}, {"glEndConditionalRender", P(gl::EndConditionalRender)},
{"glEndList", P(gl::EndList)}, {"glEndList", P(gl::EndList)},
{"glEndQuery", P(gl::EndQuery)},
{"glEndTransformFeedback", P(gl::EndTransformFeedback)},
{"glEvalCoord1d", P(gl::EvalCoord1d)}, {"glEvalCoord1d", P(gl::EvalCoord1d)},
{"glEvalCoord1dv", P(gl::EvalCoord1dv)}, {"glEvalCoord1dv", P(gl::EvalCoord1dv)},
{"glEvalCoord1f", P(gl::EvalCoord1f)}, {"glEvalCoord1f", P(gl::EvalCoord1f)},
...@@ -103,33 +176,104 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -103,33 +176,104 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glEvalPoint1", P(gl::EvalPoint1)}, {"glEvalPoint1", P(gl::EvalPoint1)},
{"glEvalPoint2", P(gl::EvalPoint2)}, {"glEvalPoint2", P(gl::EvalPoint2)},
{"glFeedbackBuffer", P(gl::FeedbackBuffer)}, {"glFeedbackBuffer", P(gl::FeedbackBuffer)},
{"glFinish", P(gl::Finish)},
{"glFlush", P(gl::Flush)},
{"glFlushMappedBufferRange", P(gl::FlushMappedBufferRange)},
{"glFogCoordPointer", P(gl::FogCoordPointer)}, {"glFogCoordPointer", P(gl::FogCoordPointer)},
{"glFogCoordd", P(gl::FogCoordd)}, {"glFogCoordd", P(gl::FogCoordd)},
{"glFogCoorddv", P(gl::FogCoorddv)}, {"glFogCoorddv", P(gl::FogCoorddv)},
{"glFogCoordf", P(gl::FogCoordf)}, {"glFogCoordf", P(gl::FogCoordf)},
{"glFogCoordfv", P(gl::FogCoordfv)}, {"glFogCoordfv", P(gl::FogCoordfv)},
{"glFogf", P(gl::Fogf)},
{"glFogfv", P(gl::Fogfv)},
{"glFogi", P(gl::Fogi)}, {"glFogi", P(gl::Fogi)},
{"glFogiv", P(gl::Fogiv)}, {"glFogiv", P(gl::Fogiv)},
{"glFramebufferRenderbuffer", P(gl::FramebufferRenderbuffer)},
{"glFramebufferTexture1D", P(gl::FramebufferTexture1D)}, {"glFramebufferTexture1D", P(gl::FramebufferTexture1D)},
{"glFramebufferTexture2D", P(gl::FramebufferTexture2D)},
{"glFramebufferTexture3D", P(gl::FramebufferTexture3D)},
{"glFramebufferTextureLayer", P(gl::FramebufferTextureLayer)},
{"glFrontFace", P(gl::FrontFace)},
{"glFrustum", P(gl::Frustum)}, {"glFrustum", P(gl::Frustum)},
{"glGenBuffers", P(gl::GenBuffers)},
{"glGenFramebuffers", P(gl::GenFramebuffers)},
{"glGenLists", P(gl::GenLists)}, {"glGenLists", P(gl::GenLists)},
{"glGenQueries", P(gl::GenQueries)},
{"glGenRenderbuffers", P(gl::GenRenderbuffers)},
{"glGenTextures", P(gl::GenTextures)},
{"glGenVertexArrays", P(gl::GenVertexArrays)},
{"glGenerateMipmap", P(gl::GenerateMipmap)},
{"glGetActiveAttrib", P(gl::GetActiveAttrib)},
{"glGetActiveUniform", P(gl::GetActiveUniform)},
{"glGetActiveUniformBlockName", P(gl::GetActiveUniformBlockName)},
{"glGetActiveUniformBlockiv", P(gl::GetActiveUniformBlockiv)},
{"glGetActiveUniformName", P(gl::GetActiveUniformName)}, {"glGetActiveUniformName", P(gl::GetActiveUniformName)},
{"glGetActiveUniformsiv", P(gl::GetActiveUniformsiv)},
{"glGetAttachedShaders", P(gl::GetAttachedShaders)},
{"glGetAttribLocation", P(gl::GetAttribLocation)},
{"glGetBooleani_v", P(gl::GetBooleani_v)},
{"glGetBooleanv", P(gl::GetBooleanv)},
{"glGetBufferParameteriv", P(gl::GetBufferParameteriv)},
{"glGetBufferPointerv", P(gl::GetBufferPointerv)},
{"glGetBufferSubData", P(gl::GetBufferSubData)}, {"glGetBufferSubData", P(gl::GetBufferSubData)},
{"glGetClipPlane", P(gl::GetClipPlane)}, {"glGetClipPlane", P(gl::GetClipPlane)},
{"glGetCompressedTexImage", P(gl::GetCompressedTexImage)}, {"glGetCompressedTexImage", P(gl::GetCompressedTexImage)},
{"glGetDoublev", P(gl::GetDoublev)}, {"glGetDoublev", P(gl::GetDoublev)},
{"glGetError", P(gl::GetError)},
{"glGetFloatv", P(gl::GetFloatv)},
{"glGetFragDataLocation", P(gl::GetFragDataLocation)},
{"glGetFramebufferAttachmentParameteriv", P(gl::GetFramebufferAttachmentParameteriv)},
{"glGetIntegeri_v", P(gl::GetIntegeri_v)},
{"glGetIntegerv", P(gl::GetIntegerv)},
{"glGetLightfv", P(gl::GetLightfv)},
{"glGetLightiv", P(gl::GetLightiv)}, {"glGetLightiv", P(gl::GetLightiv)},
{"glGetMapdv", P(gl::GetMapdv)}, {"glGetMapdv", P(gl::GetMapdv)},
{"glGetMapfv", P(gl::GetMapfv)}, {"glGetMapfv", P(gl::GetMapfv)},
{"glGetMapiv", P(gl::GetMapiv)}, {"glGetMapiv", P(gl::GetMapiv)},
{"glGetMaterialfv", P(gl::GetMaterialfv)},
{"glGetMaterialiv", P(gl::GetMaterialiv)}, {"glGetMaterialiv", P(gl::GetMaterialiv)},
{"glGetPixelMapfv", P(gl::GetPixelMapfv)}, {"glGetPixelMapfv", P(gl::GetPixelMapfv)},
{"glGetPixelMapuiv", P(gl::GetPixelMapuiv)}, {"glGetPixelMapuiv", P(gl::GetPixelMapuiv)},
{"glGetPixelMapusv", P(gl::GetPixelMapusv)}, {"glGetPixelMapusv", P(gl::GetPixelMapusv)},
{"glGetPointerv", P(gl::GetPointerv)},
{"glGetPolygonStipple", P(gl::GetPolygonStipple)}, {"glGetPolygonStipple", P(gl::GetPolygonStipple)},
{"glGetProgramInfoLog", P(gl::GetProgramInfoLog)},
{"glGetProgramiv", P(gl::GetProgramiv)},
{"glGetQueryObjectiv", P(gl::GetQueryObjectiv)},
{"glGetQueryObjectuiv", P(gl::GetQueryObjectuiv)},
{"glGetQueryiv", P(gl::GetQueryiv)},
{"glGetRenderbufferParameteriv", P(gl::GetRenderbufferParameteriv)},
{"glGetShaderInfoLog", P(gl::GetShaderInfoLog)},
{"glGetShaderSource", P(gl::GetShaderSource)},
{"glGetShaderiv", P(gl::GetShaderiv)},
{"glGetString", P(gl::GetString)},
{"glGetStringi", P(gl::GetStringi)},
{"glGetTexEnvfv", P(gl::GetTexEnvfv)},
{"glGetTexEnviv", P(gl::GetTexEnviv)},
{"glGetTexGendv", P(gl::GetTexGendv)}, {"glGetTexGendv", P(gl::GetTexGendv)},
{"glGetTexGenfv", P(gl::GetTexGenfv)},
{"glGetTexGeniv", P(gl::GetTexGeniv)},
{"glGetTexImage", P(gl::GetTexImage)}, {"glGetTexImage", P(gl::GetTexImage)},
{"glGetTexLevelParameterfv", P(gl::GetTexLevelParameterfv)},
{"glGetTexLevelParameteriv", P(gl::GetTexLevelParameteriv)},
{"glGetTexParameterIiv", P(gl::GetTexParameterIiv)},
{"glGetTexParameterIuiv", P(gl::GetTexParameterIuiv)},
{"glGetTexParameterfv", P(gl::GetTexParameterfv)},
{"glGetTexParameteriv", P(gl::GetTexParameteriv)},
{"glGetTransformFeedbackVarying", P(gl::GetTransformFeedbackVarying)},
{"glGetUniformBlockIndex", P(gl::GetUniformBlockIndex)},
{"glGetUniformIndices", P(gl::GetUniformIndices)},
{"glGetUniformLocation", P(gl::GetUniformLocation)},
{"glGetUniformfv", P(gl::GetUniformfv)},
{"glGetUniformiv", P(gl::GetUniformiv)},
{"glGetUniformuiv", P(gl::GetUniformuiv)},
{"glGetVertexAttribIiv", P(gl::GetVertexAttribIiv)},
{"glGetVertexAttribIuiv", P(gl::GetVertexAttribIuiv)},
{"glGetVertexAttribPointerv", P(gl::GetVertexAttribPointerv)},
{"glGetVertexAttribdv", P(gl::GetVertexAttribdv)}, {"glGetVertexAttribdv", P(gl::GetVertexAttribdv)},
{"glGetVertexAttribfv", P(gl::GetVertexAttribfv)},
{"glGetVertexAttribiv", P(gl::GetVertexAttribiv)},
{"glHint", P(gl::Hint)},
{"glIndexMask", P(gl::IndexMask)}, {"glIndexMask", P(gl::IndexMask)},
{"glIndexPointer", P(gl::IndexPointer)}, {"glIndexPointer", P(gl::IndexPointer)},
{"glIndexd", P(gl::Indexd)}, {"glIndexd", P(gl::Indexd)},
...@@ -144,31 +288,57 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -144,31 +288,57 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glIndexubv", P(gl::Indexubv)}, {"glIndexubv", P(gl::Indexubv)},
{"glInitNames", P(gl::InitNames)}, {"glInitNames", P(gl::InitNames)},
{"glInterleavedArrays", P(gl::InterleavedArrays)}, {"glInterleavedArrays", P(gl::InterleavedArrays)},
{"glIsBuffer", P(gl::IsBuffer)},
{"glIsEnabled", P(gl::IsEnabled)},
{"glIsEnabledi", P(gl::IsEnabledi)}, {"glIsEnabledi", P(gl::IsEnabledi)},
{"glIsFramebuffer", P(gl::IsFramebuffer)},
{"glIsList", P(gl::IsList)}, {"glIsList", P(gl::IsList)},
{"glIsProgram", P(gl::IsProgram)},
{"glIsQuery", P(gl::IsQuery)},
{"glIsRenderbuffer", P(gl::IsRenderbuffer)},
{"glIsShader", P(gl::IsShader)},
{"glIsTexture", P(gl::IsTexture)},
{"glIsVertexArray", P(gl::IsVertexArray)},
{"glLightModelf", P(gl::LightModelf)},
{"glLightModelfv", P(gl::LightModelfv)},
{"glLightModeli", P(gl::LightModeli)}, {"glLightModeli", P(gl::LightModeli)},
{"glLightModeliv", P(gl::LightModeliv)}, {"glLightModeliv", P(gl::LightModeliv)},
{"glLightf", P(gl::Lightf)},
{"glLightfv", P(gl::Lightfv)},
{"glLighti", P(gl::Lighti)}, {"glLighti", P(gl::Lighti)},
{"glLightiv", P(gl::Lightiv)}, {"glLightiv", P(gl::Lightiv)},
{"glLineStipple", P(gl::LineStipple)}, {"glLineStipple", P(gl::LineStipple)},
{"glLineWidth", P(gl::LineWidth)},
{"glLinkProgram", P(gl::LinkProgram)},
{"glListBase", P(gl::ListBase)}, {"glListBase", P(gl::ListBase)},
{"glLoadIdentity", P(gl::LoadIdentity)},
{"glLoadMatrixd", P(gl::LoadMatrixd)}, {"glLoadMatrixd", P(gl::LoadMatrixd)},
{"glLoadMatrixf", P(gl::LoadMatrixf)},
{"glLoadName", P(gl::LoadName)}, {"glLoadName", P(gl::LoadName)},
{"glLoadTransposeMatrixd", P(gl::LoadTransposeMatrixd)}, {"glLoadTransposeMatrixd", P(gl::LoadTransposeMatrixd)},
{"glLoadTransposeMatrixf", P(gl::LoadTransposeMatrixf)}, {"glLoadTransposeMatrixf", P(gl::LoadTransposeMatrixf)},
{"glLogicOp", P(gl::LogicOp)},
{"glMap1d", P(gl::Map1d)}, {"glMap1d", P(gl::Map1d)},
{"glMap1f", P(gl::Map1f)}, {"glMap1f", P(gl::Map1f)},
{"glMap2d", P(gl::Map2d)}, {"glMap2d", P(gl::Map2d)},
{"glMap2f", P(gl::Map2f)}, {"glMap2f", P(gl::Map2f)},
{"glMapBuffer", P(gl::MapBuffer)},
{"glMapBufferRange", P(gl::MapBufferRange)},
{"glMapGrid1d", P(gl::MapGrid1d)}, {"glMapGrid1d", P(gl::MapGrid1d)},
{"glMapGrid1f", P(gl::MapGrid1f)}, {"glMapGrid1f", P(gl::MapGrid1f)},
{"glMapGrid2d", P(gl::MapGrid2d)}, {"glMapGrid2d", P(gl::MapGrid2d)},
{"glMapGrid2f", P(gl::MapGrid2f)}, {"glMapGrid2f", P(gl::MapGrid2f)},
{"glMaterialf", P(gl::Materialf)},
{"glMaterialfv", P(gl::Materialfv)},
{"glMateriali", P(gl::Materiali)}, {"glMateriali", P(gl::Materiali)},
{"glMaterialiv", P(gl::Materialiv)}, {"glMaterialiv", P(gl::Materialiv)},
{"glMatrixMode", P(gl::MatrixMode)},
{"glMultMatrixd", P(gl::MultMatrixd)}, {"glMultMatrixd", P(gl::MultMatrixd)},
{"glMultMatrixf", P(gl::MultMatrixf)},
{"glMultTransposeMatrixd", P(gl::MultTransposeMatrixd)}, {"glMultTransposeMatrixd", P(gl::MultTransposeMatrixd)},
{"glMultTransposeMatrixf", P(gl::MultTransposeMatrixf)}, {"glMultTransposeMatrixf", P(gl::MultTransposeMatrixf)},
{"glMultiDrawArrays", P(gl::MultiDrawArrays)},
{"glMultiDrawElements", P(gl::MultiDrawElements)},
{"glMultiTexCoord1d", P(gl::MultiTexCoord1d)}, {"glMultiTexCoord1d", P(gl::MultiTexCoord1d)},
{"glMultiTexCoord1dv", P(gl::MultiTexCoord1dv)}, {"glMultiTexCoord1dv", P(gl::MultiTexCoord1dv)},
{"glMultiTexCoord1f", P(gl::MultiTexCoord1f)}, {"glMultiTexCoord1f", P(gl::MultiTexCoord1f)},
...@@ -195,6 +365,7 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -195,6 +365,7 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glMultiTexCoord3sv", P(gl::MultiTexCoord3sv)}, {"glMultiTexCoord3sv", P(gl::MultiTexCoord3sv)},
{"glMultiTexCoord4d", P(gl::MultiTexCoord4d)}, {"glMultiTexCoord4d", P(gl::MultiTexCoord4d)},
{"glMultiTexCoord4dv", P(gl::MultiTexCoord4dv)}, {"glMultiTexCoord4dv", P(gl::MultiTexCoord4dv)},
{"glMultiTexCoord4f", P(gl::MultiTexCoord4f)},
{"glMultiTexCoord4fv", P(gl::MultiTexCoord4fv)}, {"glMultiTexCoord4fv", P(gl::MultiTexCoord4fv)},
{"glMultiTexCoord4i", P(gl::MultiTexCoord4i)}, {"glMultiTexCoord4i", P(gl::MultiTexCoord4i)},
{"glMultiTexCoord4iv", P(gl::MultiTexCoord4iv)}, {"glMultiTexCoord4iv", P(gl::MultiTexCoord4iv)},
...@@ -205,31 +376,40 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -205,31 +376,40 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glNormal3bv", P(gl::Normal3bv)}, {"glNormal3bv", P(gl::Normal3bv)},
{"glNormal3d", P(gl::Normal3d)}, {"glNormal3d", P(gl::Normal3d)},
{"glNormal3dv", P(gl::Normal3dv)}, {"glNormal3dv", P(gl::Normal3dv)},
{"glNormal3f", P(gl::Normal3f)},
{"glNormal3fv", P(gl::Normal3fv)}, {"glNormal3fv", P(gl::Normal3fv)},
{"glNormal3i", P(gl::Normal3i)}, {"glNormal3i", P(gl::Normal3i)},
{"glNormal3iv", P(gl::Normal3iv)}, {"glNormal3iv", P(gl::Normal3iv)},
{"glNormal3s", P(gl::Normal3s)}, {"glNormal3s", P(gl::Normal3s)},
{"glNormal3sv", P(gl::Normal3sv)}, {"glNormal3sv", P(gl::Normal3sv)},
{"glNormalPointer", P(gl::NormalPointer)},
{"glOrtho", P(gl::Ortho)}, {"glOrtho", P(gl::Ortho)},
{"glPassThrough", P(gl::PassThrough)}, {"glPassThrough", P(gl::PassThrough)},
{"glPixelMapfv", P(gl::PixelMapfv)}, {"glPixelMapfv", P(gl::PixelMapfv)},
{"glPixelMapuiv", P(gl::PixelMapuiv)}, {"glPixelMapuiv", P(gl::PixelMapuiv)},
{"glPixelMapusv", P(gl::PixelMapusv)}, {"glPixelMapusv", P(gl::PixelMapusv)},
{"glPixelStoref", P(gl::PixelStoref)}, {"glPixelStoref", P(gl::PixelStoref)},
{"glPixelStorei", P(gl::PixelStorei)},
{"glPixelTransferf", P(gl::PixelTransferf)}, {"glPixelTransferf", P(gl::PixelTransferf)},
{"glPixelTransferi", P(gl::PixelTransferi)}, {"glPixelTransferi", P(gl::PixelTransferi)},
{"glPixelZoom", P(gl::PixelZoom)}, {"glPixelZoom", P(gl::PixelZoom)},
{"glPointParameterf", P(gl::PointParameterf)},
{"glPointParameterfv", P(gl::PointParameterfv)},
{"glPointParameteri", P(gl::PointParameteri)}, {"glPointParameteri", P(gl::PointParameteri)},
{"glPointParameteriv", P(gl::PointParameteriv)}, {"glPointParameteriv", P(gl::PointParameteriv)},
{"glPointSize", P(gl::PointSize)},
{"glPolygonMode", P(gl::PolygonMode)}, {"glPolygonMode", P(gl::PolygonMode)},
{"glPolygonOffset", P(gl::PolygonOffset)},
{"glPolygonStipple", P(gl::PolygonStipple)}, {"glPolygonStipple", P(gl::PolygonStipple)},
{"glPopAttrib", P(gl::PopAttrib)}, {"glPopAttrib", P(gl::PopAttrib)},
{"glPopClientAttrib", P(gl::PopClientAttrib)}, {"glPopClientAttrib", P(gl::PopClientAttrib)},
{"glPopMatrix", P(gl::PopMatrix)},
{"glPopName", P(gl::PopName)}, {"glPopName", P(gl::PopName)},
{"glPrimitiveRestartIndex", P(gl::PrimitiveRestartIndex)}, {"glPrimitiveRestartIndex", P(gl::PrimitiveRestartIndex)},
{"glPrioritizeTextures", P(gl::PrioritizeTextures)}, {"glPrioritizeTextures", P(gl::PrioritizeTextures)},
{"glPushAttrib", P(gl::PushAttrib)}, {"glPushAttrib", P(gl::PushAttrib)},
{"glPushClientAttrib", P(gl::PushClientAttrib)}, {"glPushClientAttrib", P(gl::PushClientAttrib)},
{"glPushMatrix", P(gl::PushMatrix)},
{"glPushName", P(gl::PushName)}, {"glPushName", P(gl::PushName)},
{"glRasterPos2d", P(gl::RasterPos2d)}, {"glRasterPos2d", P(gl::RasterPos2d)},
{"glRasterPos2dv", P(gl::RasterPos2dv)}, {"glRasterPos2dv", P(gl::RasterPos2dv)},
...@@ -255,6 +435,8 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -255,6 +435,8 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glRasterPos4iv", P(gl::RasterPos4iv)}, {"glRasterPos4iv", P(gl::RasterPos4iv)},
{"glRasterPos4s", P(gl::RasterPos4s)}, {"glRasterPos4s", P(gl::RasterPos4s)},
{"glRasterPos4sv", P(gl::RasterPos4sv)}, {"glRasterPos4sv", P(gl::RasterPos4sv)},
{"glReadBuffer", P(gl::ReadBuffer)},
{"glReadPixels", P(gl::ReadPixels)},
{"glRectd", P(gl::Rectd)}, {"glRectd", P(gl::Rectd)},
{"glRectdv", P(gl::Rectdv)}, {"glRectdv", P(gl::Rectdv)},
{"glRectf", P(gl::Rectf)}, {"glRectf", P(gl::Rectf)},
...@@ -264,8 +446,14 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -264,8 +446,14 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glRects", P(gl::Rects)}, {"glRects", P(gl::Rects)},
{"glRectsv", P(gl::Rectsv)}, {"glRectsv", P(gl::Rectsv)},
{"glRenderMode", P(gl::RenderMode)}, {"glRenderMode", P(gl::RenderMode)},
{"glRenderbufferStorage", P(gl::RenderbufferStorage)},
{"glRenderbufferStorageMultisample", P(gl::RenderbufferStorageMultisample)},
{"glRotated", P(gl::Rotated)}, {"glRotated", P(gl::Rotated)},
{"glRotatef", P(gl::Rotatef)},
{"glSampleCoverage", P(gl::SampleCoverage)},
{"glScaled", P(gl::Scaled)}, {"glScaled", P(gl::Scaled)},
{"glScalef", P(gl::Scalef)},
{"glScissor", P(gl::Scissor)},
{"glSecondaryColor3b", P(gl::SecondaryColor3b)}, {"glSecondaryColor3b", P(gl::SecondaryColor3b)},
{"glSecondaryColor3bv", P(gl::SecondaryColor3bv)}, {"glSecondaryColor3bv", P(gl::SecondaryColor3bv)},
{"glSecondaryColor3d", P(gl::SecondaryColor3d)}, {"glSecondaryColor3d", P(gl::SecondaryColor3d)},
...@@ -284,6 +472,14 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -284,6 +472,14 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glSecondaryColor3usv", P(gl::SecondaryColor3usv)}, {"glSecondaryColor3usv", P(gl::SecondaryColor3usv)},
{"glSecondaryColorPointer", P(gl::SecondaryColorPointer)}, {"glSecondaryColorPointer", P(gl::SecondaryColorPointer)},
{"glSelectBuffer", P(gl::SelectBuffer)}, {"glSelectBuffer", P(gl::SelectBuffer)},
{"glShadeModel", P(gl::ShadeModel)},
{"glShaderSource", P(gl::ShaderSource)},
{"glStencilFunc", P(gl::StencilFunc)},
{"glStencilFuncSeparate", P(gl::StencilFuncSeparate)},
{"glStencilMask", P(gl::StencilMask)},
{"glStencilMaskSeparate", P(gl::StencilMaskSeparate)},
{"glStencilOp", P(gl::StencilOp)},
{"glStencilOpSeparate", P(gl::StencilOpSeparate)},
{"glTexBuffer", P(gl::TexBuffer)}, {"glTexBuffer", P(gl::TexBuffer)},
{"glTexCoord1d", P(gl::TexCoord1d)}, {"glTexCoord1d", P(gl::TexCoord1d)},
{"glTexCoord1dv", P(gl::TexCoord1dv)}, {"glTexCoord1dv", P(gl::TexCoord1dv)},
...@@ -317,11 +513,69 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -317,11 +513,69 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glTexCoord4iv", P(gl::TexCoord4iv)}, {"glTexCoord4iv", P(gl::TexCoord4iv)},
{"glTexCoord4s", P(gl::TexCoord4s)}, {"glTexCoord4s", P(gl::TexCoord4s)},
{"glTexCoord4sv", P(gl::TexCoord4sv)}, {"glTexCoord4sv", P(gl::TexCoord4sv)},
{"glTexCoordPointer", P(gl::TexCoordPointer)},
{"glTexEnvf", P(gl::TexEnvf)},
{"glTexEnvfv", P(gl::TexEnvfv)},
{"glTexEnvi", P(gl::TexEnvi)},
{"glTexEnviv", P(gl::TexEnviv)},
{"glTexGend", P(gl::TexGend)}, {"glTexGend", P(gl::TexGend)},
{"glTexGendv", P(gl::TexGendv)}, {"glTexGendv", P(gl::TexGendv)},
{"glTexGenf", P(gl::TexGenf)},
{"glTexGenfv", P(gl::TexGenfv)},
{"glTexGeni", P(gl::TexGeni)},
{"glTexGeniv", P(gl::TexGeniv)},
{"glTexImage1D", P(gl::TexImage1D)}, {"glTexImage1D", P(gl::TexImage1D)},
{"glTexImage2D", P(gl::TexImage2D)},
{"glTexImage3D", P(gl::TexImage3D)},
{"glTexParameterIiv", P(gl::TexParameterIiv)},
{"glTexParameterIuiv", P(gl::TexParameterIuiv)},
{"glTexParameterf", P(gl::TexParameterf)},
{"glTexParameterfv", P(gl::TexParameterfv)},
{"glTexParameteri", P(gl::TexParameteri)},
{"glTexParameteriv", P(gl::TexParameteriv)},
{"glTexSubImage1D", P(gl::TexSubImage1D)}, {"glTexSubImage1D", P(gl::TexSubImage1D)},
{"glTexSubImage2D", P(gl::TexSubImage2D)},
{"glTexSubImage3D", P(gl::TexSubImage3D)},
{"glTransformFeedbackVaryings", P(gl::TransformFeedbackVaryings)},
{"glTranslated", P(gl::Translated)}, {"glTranslated", P(gl::Translated)},
{"glTranslatef", P(gl::Translatef)},
{"glUniform1f", P(gl::Uniform1f)},
{"glUniform1fv", P(gl::Uniform1fv)},
{"glUniform1i", P(gl::Uniform1i)},
{"glUniform1iv", P(gl::Uniform1iv)},
{"glUniform1ui", P(gl::Uniform1ui)},
{"glUniform1uiv", P(gl::Uniform1uiv)},
{"glUniform2f", P(gl::Uniform2f)},
{"glUniform2fv", P(gl::Uniform2fv)},
{"glUniform2i", P(gl::Uniform2i)},
{"glUniform2iv", P(gl::Uniform2iv)},
{"glUniform2ui", P(gl::Uniform2ui)},
{"glUniform2uiv", P(gl::Uniform2uiv)},
{"glUniform3f", P(gl::Uniform3f)},
{"glUniform3fv", P(gl::Uniform3fv)},
{"glUniform3i", P(gl::Uniform3i)},
{"glUniform3iv", P(gl::Uniform3iv)},
{"glUniform3ui", P(gl::Uniform3ui)},
{"glUniform3uiv", P(gl::Uniform3uiv)},
{"glUniform4f", P(gl::Uniform4f)},
{"glUniform4fv", P(gl::Uniform4fv)},
{"glUniform4i", P(gl::Uniform4i)},
{"glUniform4iv", P(gl::Uniform4iv)},
{"glUniform4ui", P(gl::Uniform4ui)},
{"glUniform4uiv", P(gl::Uniform4uiv)},
{"glUniformBlockBinding", P(gl::UniformBlockBinding)},
{"glUniformMatrix2fv", P(gl::UniformMatrix2fv)},
{"glUniformMatrix2x3fv", P(gl::UniformMatrix2x3fv)},
{"glUniformMatrix2x4fv", P(gl::UniformMatrix2x4fv)},
{"glUniformMatrix3fv", P(gl::UniformMatrix3fv)},
{"glUniformMatrix3x2fv", P(gl::UniformMatrix3x2fv)},
{"glUniformMatrix3x4fv", P(gl::UniformMatrix3x4fv)},
{"glUniformMatrix4fv", P(gl::UniformMatrix4fv)},
{"glUniformMatrix4x2fv", P(gl::UniformMatrix4x2fv)},
{"glUniformMatrix4x3fv", P(gl::UniformMatrix4x3fv)},
{"glUnmapBuffer", P(gl::UnmapBuffer)},
{"glUseProgram", P(gl::UseProgram)},
{"glValidateProgram", P(gl::ValidateProgram)},
{"glVertex2d", P(gl::Vertex2d)}, {"glVertex2d", P(gl::Vertex2d)},
{"glVertex2dv", P(gl::Vertex2dv)}, {"glVertex2dv", P(gl::Vertex2dv)},
{"glVertex2f", P(gl::Vertex2f)}, {"glVertex2f", P(gl::Vertex2f)},
...@@ -348,14 +602,20 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -348,14 +602,20 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glVertex4sv", P(gl::Vertex4sv)}, {"glVertex4sv", P(gl::Vertex4sv)},
{"glVertexAttrib1d", P(gl::VertexAttrib1d)}, {"glVertexAttrib1d", P(gl::VertexAttrib1d)},
{"glVertexAttrib1dv", P(gl::VertexAttrib1dv)}, {"glVertexAttrib1dv", P(gl::VertexAttrib1dv)},
{"glVertexAttrib1f", P(gl::VertexAttrib1f)},
{"glVertexAttrib1fv", P(gl::VertexAttrib1fv)},
{"glVertexAttrib1s", P(gl::VertexAttrib1s)}, {"glVertexAttrib1s", P(gl::VertexAttrib1s)},
{"glVertexAttrib1sv", P(gl::VertexAttrib1sv)}, {"glVertexAttrib1sv", P(gl::VertexAttrib1sv)},
{"glVertexAttrib2d", P(gl::VertexAttrib2d)}, {"glVertexAttrib2d", P(gl::VertexAttrib2d)},
{"glVertexAttrib2dv", P(gl::VertexAttrib2dv)}, {"glVertexAttrib2dv", P(gl::VertexAttrib2dv)},
{"glVertexAttrib2f", P(gl::VertexAttrib2f)},
{"glVertexAttrib2fv", P(gl::VertexAttrib2fv)},
{"glVertexAttrib2s", P(gl::VertexAttrib2s)}, {"glVertexAttrib2s", P(gl::VertexAttrib2s)},
{"glVertexAttrib2sv", P(gl::VertexAttrib2sv)}, {"glVertexAttrib2sv", P(gl::VertexAttrib2sv)},
{"glVertexAttrib3d", P(gl::VertexAttrib3d)}, {"glVertexAttrib3d", P(gl::VertexAttrib3d)},
{"glVertexAttrib3dv", P(gl::VertexAttrib3dv)}, {"glVertexAttrib3dv", P(gl::VertexAttrib3dv)},
{"glVertexAttrib3f", P(gl::VertexAttrib3f)},
{"glVertexAttrib3fv", P(gl::VertexAttrib3fv)},
{"glVertexAttrib3s", P(gl::VertexAttrib3s)}, {"glVertexAttrib3s", P(gl::VertexAttrib3s)},
{"glVertexAttrib3sv", P(gl::VertexAttrib3sv)}, {"glVertexAttrib3sv", P(gl::VertexAttrib3sv)},
{"glVertexAttrib4Nbv", P(gl::VertexAttrib4Nbv)}, {"glVertexAttrib4Nbv", P(gl::VertexAttrib4Nbv)},
...@@ -368,6 +628,8 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -368,6 +628,8 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glVertexAttrib4bv", P(gl::VertexAttrib4bv)}, {"glVertexAttrib4bv", P(gl::VertexAttrib4bv)},
{"glVertexAttrib4d", P(gl::VertexAttrib4d)}, {"glVertexAttrib4d", P(gl::VertexAttrib4d)},
{"glVertexAttrib4dv", P(gl::VertexAttrib4dv)}, {"glVertexAttrib4dv", P(gl::VertexAttrib4dv)},
{"glVertexAttrib4f", P(gl::VertexAttrib4f)},
{"glVertexAttrib4fv", P(gl::VertexAttrib4fv)},
{"glVertexAttrib4iv", P(gl::VertexAttrib4iv)}, {"glVertexAttrib4iv", P(gl::VertexAttrib4iv)},
{"glVertexAttrib4s", P(gl::VertexAttrib4s)}, {"glVertexAttrib4s", P(gl::VertexAttrib4s)},
{"glVertexAttrib4sv", P(gl::VertexAttrib4sv)}, {"glVertexAttrib4sv", P(gl::VertexAttrib4sv)},
...@@ -387,9 +649,17 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -387,9 +649,17 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"glVertexAttribI3ui", P(gl::VertexAttribI3ui)}, {"glVertexAttribI3ui", P(gl::VertexAttribI3ui)},
{"glVertexAttribI3uiv", P(gl::VertexAttribI3uiv)}, {"glVertexAttribI3uiv", P(gl::VertexAttribI3uiv)},
{"glVertexAttribI4bv", P(gl::VertexAttribI4bv)}, {"glVertexAttribI4bv", P(gl::VertexAttribI4bv)},
{"glVertexAttribI4i", P(gl::VertexAttribI4i)},
{"glVertexAttribI4iv", P(gl::VertexAttribI4iv)},
{"glVertexAttribI4sv", P(gl::VertexAttribI4sv)}, {"glVertexAttribI4sv", P(gl::VertexAttribI4sv)},
{"glVertexAttribI4ubv", P(gl::VertexAttribI4ubv)}, {"glVertexAttribI4ubv", P(gl::VertexAttribI4ubv)},
{"glVertexAttribI4ui", P(gl::VertexAttribI4ui)},
{"glVertexAttribI4uiv", P(gl::VertexAttribI4uiv)},
{"glVertexAttribI4usv", P(gl::VertexAttribI4usv)}, {"glVertexAttribI4usv", P(gl::VertexAttribI4usv)},
{"glVertexAttribIPointer", P(gl::VertexAttribIPointer)},
{"glVertexAttribPointer", P(gl::VertexAttribPointer)},
{"glVertexPointer", P(gl::VertexPointer)},
{"glViewport", P(gl::Viewport)},
{"glWindowPos2d", P(gl::WindowPos2d)}, {"glWindowPos2d", P(gl::WindowPos2d)},
{"glWindowPos2dv", P(gl::WindowPos2dv)}, {"glWindowPos2dv", P(gl::WindowPos2dv)},
{"glWindowPos2f", P(gl::WindowPos2f)}, {"glWindowPos2f", P(gl::WindowPos2f)},
...@@ -433,5 +703,5 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)}, ...@@ -433,5 +703,5 @@ ProcEntry g_procTable[] = {{"glAccum", P(gl::Accum)},
{"wglUseFontOutlinesA", P(wglUseFontOutlinesA)}, {"wglUseFontOutlinesA", P(wglUseFontOutlinesA)},
{"wglUseFontOutlinesW", P(wglUseFontOutlinesW)}}; {"wglUseFontOutlinesW", P(wglUseFontOutlinesW)}};
size_t g_numProcs = 404; size_t g_numProcs = 673;
} // namespace wgl } // namespace wgl
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment