Merge https://github.com/nigels-com/glew.git into master HEAD at Mon Feb 4 17:44:16 GMT 2019

This commit is contained in:
Gyusun Yeom 2019-02-05 02:44:16 +09:00
commit edf558f8f6
10 changed files with 45 additions and 61 deletions

View File

@ -111,11 +111,19 @@ $(EXT)/.dummy: OpenGL-Registry/.dummy EGL-Registry/.dummy
cp -r glfixes/gl/specs/ANGLE OpenGL-Registry/extensions
cp -r glfixes/gl/specs/REGAL OpenGL-Registry/extensions
$(BIN)/update_ext.sh $(EXT) OpenGL-Registry/extensions $(BLACKLIST)
$(BIN)/filter_gl_ext.sh $(EXT)
@echo "--------------------------------------------------------------------"
@echo "WGL descriptors"
@echo "--------------------------------------------------------------------"
rm -f $(EXT)/WGL_*
$(PYTHON) $(BIN)/parse_xml.py OpenGL-Registry/xml/wgl.xml --api wgl --extensions extensions/gl
@echo "--------------------------------------------------------------------"
@echo "EGL descriptors"
@echo "--------------------------------------------------------------------"
$(PYTHON) $(BIN)/parse_xml.py EGL-Registry/api/egl.xml --extensions extensions/gl
$(PYTHON) $(BIN)/parse_xml.py EGL-Registry/api/egl.xml --api egl --extensions extensions/gl
@echo "--------------------------------------------------------------------"
@echo "filter descriptors"
@echo "--------------------------------------------------------------------"
$(BIN)/filter_gl_ext.sh $(EXT)
ifeq ($(patsubst Darwin%,Darwin,$(SYSTEM)), Darwin)
find $(CORE) -maxdepth 1 -type f | grep -v VERSION | grep -v "~" | \
xargs -J % cp % $(EXT)

View File

@ -1,9 +1,13 @@
#!/usr/bin/python
#!/usr/bin/env python
import re
import sys
from xml.dom.minidom import parse, Node
#
# DOM traversal utility functions
#
def findChildren(node, path):
result = []
if len(path)==1:
@ -21,6 +25,8 @@ def findChildren(node, path):
def findData(node, path):
return [ i.firstChild.data for i in findChildren(node, path) ]
isPointer = re.compile('(.*)([ ]+)([*]+)')
def findParams(node):
n = findData(node, ['name'])[0]
t = ''
@ -29,7 +35,12 @@ def findParams(node):
t += i.data
if i.nodeType==Node.ELEMENT_NODE and i.tagName=='ptype':
t += i.firstChild.data
return ( t, n)
t.strip()
m = isPointer.match(t)
if m:
t = ('%s%s'%(m.group(1), m.group(3))).strip()
return ( t, n.strip())
def findEnums(dom):
ret = {}
@ -80,23 +91,39 @@ def findApi(dom, name):
extensions = findExtensions(dom)
return (enums, commands, features, extensions)
#
#
#
isWGL = re.compile('WGL_([A-Z0-9]+)_.*')
def writeExtension(f, name, extension, enums, commands):
f.write('%s\n'%name)
f.write('%s\n'%'https://www.khronos.org/registry/egl/specs/eglspec.1.5.pdf')
url = 'https://www.khronos.org/registry/egl/specs/eglspec.1.5.pdf'
m = isWGL.match(name)
if m:
url = 'https://www.khronos.org/registry/OpenGL/extensions/%s/%s.txt'%(m.group(1), name)
f.write('%s\n'%(url))
if name.find('_VERSION_')==-1:
f.write('%s\n'%name)
else:
f.write('\n')
f.write('\n')
enums = [ (j, enums[j]) for j in extension[0] ]
for e in sorted(enums, key=lambda i: i[1]):
f.write('\t%s %s\n'%(e[0], e[1]))
commands = [ (j, commands[j]) for j in extension[1] ]
for c in sorted(commands):
params = ', '.join( [ '%s %s'%(j[0], j[1]) for j in c[1][1] ] )
params = ', '.join( [ '%s %s'%(j[0].strip(), j[1].strip()) for j in c[1][1] ] )
if len(params)==0:
params = ' void '
f.write('\t%s %s (%s)\n'%(c[1][0], c[0], params))
params = 'void'
f.write('\t%s %s (%s)\n'%(c[1][0].strip(), c[0].strip(), params))
if __name__ == '__main__':
@ -105,6 +132,7 @@ if __name__ == '__main__':
parser = OptionParser('usage: %prog [options] [XML specs...]')
parser.add_option("--core", dest="core", help="location for core outputs", default='')
parser.add_option("--api", dest="name", help="API name: egl, wgl, glx, etc", default='')
parser.add_option("--extensions", dest="extensions", help="location for extensions outputs", default='')
(options, args) = parser.parse_args()
@ -112,7 +140,7 @@ if __name__ == '__main__':
for i in args:
dom = parse(i)
api = findApi(dom, 'egl')
api = findApi(dom, options.name)
print('Found {} enums, {} commands, {} features and {} extensions.'.format(
len(api[0]), len(api[1]), len(api[2]), len(api[3])))

View File

@ -1,8 +0,0 @@
WGL_ARB_context_flush_control
https://www.khronos.org/registry/OpenGL/extensions/KHR/KHR_context_flush_control.txt
WGL_ARB_context_flush_control
WGL_CONTEXT_RELEASE_BEHAVIOR_ARB 0x2097
WGL_CONTEXT_RELEASE_BEHAVIOR_NONE_ARB 0x0000
WGL_CONTEXT_RELEASE_BEHAVIOR_FLUSH_ARB 0x2098

View File

@ -1,13 +0,0 @@
WGL_ARB_create_context
http://www.opengl.org/registry/specs/ARB/wgl_create_context.txt
WGL_ARB_create_context
WGL_CONTEXT_DEBUG_BIT_ARB 0x0001
WGL_CONTEXT_FORWARD_COMPATIBLE_BIT_ARB 0x0002
WGL_CONTEXT_MAJOR_VERSION_ARB 0x2091
WGL_CONTEXT_MINOR_VERSION_ARB 0x2092
WGL_CONTEXT_LAYER_PLANE_ARB 0x2093
WGL_CONTEXT_FLAGS_ARB 0x2094
ERROR_INVALID_VERSION_ARB 0x2095
ERROR_INVALID_PROFILE_ARB 0x2096
HGLRC wglCreateContextAttribsARB (HDC hDC, HGLRC hShareContext, const int* attribList)

View File

@ -1,5 +0,0 @@
WGL_ATI_render_texture_rectangle
WGL_ATI_render_texture_rectangle
WGL_TEXTURE_RECTANGLE_ATI 0x21A5

View File

@ -1,5 +0,0 @@
WGL_EXT_create_context_es2_profile
http://www.opengl.org/registry/specs/EXT/wgl_create_context_es2_profile.txt
WGL_EXT_create_context_es2_profile
WGL_CONTEXT_ES2_PROFILE_BIT_EXT 0x00000004

View File

@ -1,5 +0,0 @@
WGL_EXT_create_context_es_profile
http://www.opengl.org/registry/specs/EXT/wgl_create_context_es_profile.txt
WGL_EXT_create_context_es_profile
WGL_CONTEXT_ES_PROFILE_BIT_EXT 0x00000004

View File

@ -1,5 +0,0 @@
WGL_EXT_framebuffer_sRGB
http://developer.download.nvidia.com/opengl/specs/GL_EXT_framebuffer_sRGB.txt
WGL_EXT_framebuffer_sRGB
WGL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x20A9

View File

@ -1,5 +0,0 @@
WGL_EXT_pixel_format_packed_float
http://developer.download.nvidia.com/opengl/specs/GL_EXT_packed_float.txt
WGL_EXT_pixel_format_packed_float
WGL_TYPE_RGBA_UNSIGNED_FLOAT_EXT 0x20A8

View File

@ -1,6 +0,0 @@
WGL_NV_vertex_array_range
http://oss.sgi.com/projects/ogl-sample/registry/NV/vertex_array_range.txt
WGL_NV_vertex_array_range
void * wglAllocateMemoryNV (GLsizei size, GLfloat readFrequency, GLfloat writeFrequency, GLfloat priority)
void wglFreeMemoryNV (void *pointer)