aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
committermarha <marha@users.sourceforge.net>2011-06-09 09:24:20 +0200
commit0a9d2abef2e6fac5d52556969655a62711df6418 (patch)
tree86d46767bedf8271ec0f67442259c5b3e7a8bb87 /mesalib/src/mapi/glapi
parentadeb8256da9b636648178f729d7b3316a0a8e990 (diff)
downloadvcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.gz
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.tar.bz2
vcxsrv-0a9d2abef2e6fac5d52556969655a62711df6418.zip
mesa xkbcomp xkeyboard-config git update 9 Jun 2011
Diffstat (limited to 'mesalib/src/mapi/glapi')
-rw-r--r--mesalib/src/mapi/glapi/gen-es/Makefile4
-rw-r--r--mesalib/src/mapi/glapi/gen/Makefile4
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_table.py41
3 files changed, 26 insertions, 23 deletions
diff --git a/mesalib/src/mapi/glapi/gen-es/Makefile b/mesalib/src/mapi/glapi/gen-es/Makefile
index 7a5bb35ca..bf66ec037 100644
--- a/mesalib/src/mapi/glapi/gen-es/Makefile
+++ b/mesalib/src/mapi/glapi/gen-es/Makefile
@@ -5,7 +5,7 @@ include $(TOP)/configs/current
OUTPUTS := \
glapi_mapi_tmp.h \
- main/glapidispatch.h \
+ main/dispatch.h \
main/remap_helper.h
COMMON = gl_and_es_API.xml gl_XML.py glX_XML.py license.py typeexpr.py
@@ -57,7 +57,7 @@ endef
$(PYTHON2) $(PYTHON_FLAGS) $< \
--printer $(PRINTER) --mode lib $(GLAPI)/gl_and_es_API.xml > $@
-%/main/glapidispatch.h: $(GLAPI)/gl_table.py $(COMMON)
+%/main/dispatch.h: $(GLAPI)/gl_table.py $(COMMON)
$(call gen-glapi,-c -m remap_table)
%/main/remap_helper.h: $(GLAPI)/remap_helper.py $(COMMON)
diff --git a/mesalib/src/mapi/glapi/gen/Makefile b/mesalib/src/mapi/glapi/gen/Makefile
index c3829dc00..7415bdc52 100644
--- a/mesalib/src/mapi/glapi/gen/Makefile
+++ b/mesalib/src/mapi/glapi/gen/Makefile
@@ -27,7 +27,7 @@ MESA_OUTPUTS = \
$(MESA_GLAPI_OUTPUTS) \
$(MESA_GLAPI_ASM_OUTPUTS) \
$(MESA_DIR)/main/enums.c \
- $(MESA_DIR)/main/glapidispatch.h \
+ $(MESA_DIR)/main/dispatch.h \
$(MESA_DIR)/main/remap_helper.h \
$(MESA_GLX_DIR)/indirect.c \
$(MESA_GLX_DIR)/indirect.h \
@@ -180,7 +180,7 @@ $(MESA_DIR)/main/enums.c: gl_enums.py $(COMMON) $(ES_API)
-f $(MESA_GLAPI_DIR)/gen-es/es1_API.xml \
-f $(MESA_GLAPI_DIR)/gen-es/es2_API.xml > $@
-$(MESA_DIR)/main/glapidispatch.h: gl_table.py $(COMMON)
+$(MESA_DIR)/main/dispatch.h: gl_table.py $(COMMON)
$(PYTHON2) $(PYTHON_FLAGS) $< -m remap_table > $@
$(MESA_DIR)/main/remap_helper.h: remap_helper.py $(COMMON)
diff --git a/mesalib/src/mapi/glapi/gen/gl_table.py b/mesalib/src/mapi/glapi/gen/gl_table.py
index c3cc6164f..05979e381 100644
--- a/mesalib/src/mapi/glapi/gen/gl_table.py
+++ b/mesalib/src/mapi/glapi/gen/gl_table.py
@@ -73,7 +73,7 @@ class PrintRemapTable(gl_XML.gl_print_base):
gl_XML.gl_print_base.__init__(self)
self.es = es
- self.header_tag = '_GLAPI_DISPATCH_H_'
+ self.header_tag = '_DISPATCH_H_'
self.name = "gl_table.py (from Mesa)"
self.license = license.bsd_license_template % ("(C) Copyright IBM Corporation 2005", "IBM")
return
@@ -81,10 +81,8 @@ class PrintRemapTable(gl_XML.gl_print_base):
def printRealHeader(self):
print """
-/* this file should not be included directly in mesa */
-
/**
- * \\file glapidispatch.h
+ * \\file main/dispatch.h
* Macros for handling GL dispatch tables.
*
* For each known GL function, there are 3 macros in this file. The first
@@ -93,8 +91,9 @@ class PrintRemapTable(gl_XML.gl_print_base):
* can SET_FuncName, are used to get and set the dispatch pointer for the
* named function in the specified dispatch table.
*/
+
+#include "main/mfeatures.h"
"""
-
return
def printBody(self, api):
@@ -139,24 +138,28 @@ class PrintRemapTable(gl_XML.gl_print_base):
print '#define _gloffset_%s %d' % (f.name, f.offset)
print ''
- print '#if !defined(_GLAPI_USE_REMAP_TABLE)'
+ print '#if !FEATURE_remap_table'
print ''
for f, index in functions:
print '#define _gloffset_%s %d' % (f.name, f.offset)
print ''
- print '#else /* !_GLAPI_USE_REMAP_TABLE */'
+ print '#else /* !FEATURE_remap_table */'
print ''
- print '#define driDispatchRemapTable_size %u' % (count)
- print 'extern int driDispatchRemapTable[ driDispatchRemapTable_size ];'
- print ''
- print '#if FEATURE_remap_table'
- print '#define driDispatchRemapTable remap_table'
- print 'static int remap_table[driDispatchRemapTable_size];'
- print '#endif'
- print ''
+ if self.es:
+ remap_table = "esLocalRemapTable"
+
+ print '#define %s_size %u' % (remap_table, count)
+ print 'static int %s[ %s_size ];' % (remap_table, remap_table)
+ print ''
+ else:
+ remap_table = "driDispatchRemapTable"
+
+ print '#define %s_size %u' % (remap_table, count)
+ print 'extern int %s[ %s_size ];' % (remap_table, remap_table)
+ print ''
for f, index in functions:
print '#define %s_remap_index %u' % (f.name, index)
@@ -164,10 +167,10 @@ class PrintRemapTable(gl_XML.gl_print_base):
print ''
for f, index in functions:
- print '#define _gloffset_%s driDispatchRemapTable[%s_remap_index]' % (f.name, f.name)
+ print '#define _gloffset_%s %s[%s_remap_index]' % (f.name, remap_table, f.name)
print ''
- print '#endif /* _GLAPI_USE_REMAP_TABLE */'
+ print '#endif /* !FEATURE_remap_table */'
print ''
for f, index in abi_functions + functions:
@@ -196,12 +199,12 @@ class PrintRemapTable(gl_XML.gl_print_base):
print '#define SET_%s(disp, fn) SET_%s(disp, fn)' % (name, f.name)
print ''
- print '#if defined(_GLAPI_USE_REMAP_TABLE)'
+ print '#if FEATURE_remap_table'
for f in alias_functions:
for name in f.entry_points:
if name != f.name:
print '#define %s_remap_index %s_remap_index' % (name, f.name)
- print '#endif /* defined(_GLAPI_USE_REMAP_TABLE) */'
+ print '#endif /* FEATURE_remap_table */'
print ''
return