summaryrefslogtreecommitdiff
path: root/glapi
diff options
context:
space:
mode:
authorEric Anholt <eric@anholt.net>2013-05-14 16:47:36 -0700
committerEric Anholt <eric@anholt.net>2013-06-05 15:32:55 -0700
commit1c64319e429f1e59e3b1ef8501c1368c0fadbf61 (patch)
treeeaf4017f35d899919ccdf7a658a41a643e245bd6 /glapi
parentc9f744f277939adfc29f790d5b70231b0d94f636 (diff)
Include enum.spec along with enumext.spec for piglit-dispatch.
There are three differences between the two (as verified by sort, sed, uniq, and diff): - enum.spec includes GLES extension enums (since it's used for maintaining uniqueness of enums in the registry), which we want to include for cross-API compatibility. - enum.spec includes some entries for known GL versions and GL extensions. - enumext.spec has a few more synonyms for enums (since it's the file used for generating the official glext.h for desktop). This change only introduces new #define lines to generated-dispatch.h. v2: Make the statement about "only introduces new #define lines" actually true by continuing to emit based on the categories we collected during parsing, except with them defined to '1' instead of '', to match actual glext definitions and what gets autogenerated from enum.ext. Reviewed-by: Chad Versace <chad.versace@linux.intel.com>
Diffstat (limited to 'glapi')
-rw-r--r--glapi/parse_glspec.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/glapi/parse_glspec.py b/glapi/parse_glspec.py
index 9be39f901..460512adc 100644
--- a/glapi/parse_glspec.py
+++ b/glapi/parse_glspec.py
@@ -465,5 +465,7 @@ if __name__ == '__main__':
api.read_gl_spec(f)
with open(sys.argv[3]) as f:
api.read_enumext_spec(f)
- with open(sys.argv[4], 'w') as f:
+ with open(sys.argv[4]) as f:
+ api.read_enumext_spec(f)
+ with open(sys.argv[5], 'w') as f:
f.write(api.to_json())