diff options
| author | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-05-17 07:28:52 +0300 |
|---|---|---|
| committer | Pauli Nieminen <pauli.nieminen@linux.intel.com> | 2012-05-21 17:28:59 +0300 |
| commit | 3de10c3cc982140c3d81491dd9f5ff4ed86d4cd0 (patch) | |
| tree | ae5260ba503eec0420ec3ee9e36895443653e712 | |
| parent | d9995984c8b76d1397e8f9316f311635119c1889 (diff) | |
glapi: Make json enums have complete name
Enums need to have complete name to allow mixing EGL and GL enums. Add
GL_ prefix to spec enums.
Signed-off-by: Pauli Nieminen <pauli.nieminen@linux.intel.com>
| -rw-r--r-- | glapi/parse_glspec.py | 4 | ||||
| -rw-r--r-- | tests/util/gen_dispatch.py | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/glapi/parse_glspec.py b/glapi/parse_glspec.py index 9d7d5234..16842a60 100644 --- a/glapi/parse_glspec.py +++ b/glapi/parse_glspec.py @@ -461,8 +461,10 @@ class Api(object): # 'value_str': "0xFFFFFFFF" } def parse_enum(self, m): name, value = m.groups() + if not name.startswith('GL_'): + name = 'GL_' + name if value.startswith('GL_'): - value_rhs = value[3:] + value_rhs = value value_int = self.enums[value_rhs]['value_int'] else: value_int = decode_enum_value(value) diff --git a/tests/util/gen_dispatch.py b/tests/util/gen_dispatch.py index 345260a9..63649bc7 100644 --- a/tests/util/gen_dispatch.py +++ b/tests/util/gen_dispatch.py @@ -620,7 +620,7 @@ def generate_code(api): # Emit enum #defines for name, value in api.compute_unique_enums(): - h_contents.append('#define GL_{0} {1}\n'.format(name, value)) + h_contents.append('#define {0} {1}\n'.format(name, value)) # Emit extension #defines h_contents.append('\n') |