aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mesa/main/get_hash_generator.py
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2013-01-11 08:22:46 +0100
committermarha <marha@users.sourceforge.net>2013-01-11 08:22:46 +0100
commit0e1adc84d471955eaabe26486154e8ec44e91dd4 (patch)
treee2363fb022bfa7b730b0032b4c35379aa2a997d6 /mesalib/src/mesa/main/get_hash_generator.py
parente59b1896b907c5ecfe184723d4c6adc2c20fa678 (diff)
parentddc05759f098f06bd93253a7bffe38640963dfb3 (diff)
downloadvcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.gz
vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.tar.bz2
vcxsrv-0e1adc84d471955eaabe26486154e8ec44e91dd4.zip
Merge remote-tracking branch 'origin/released'
* origin/released: fontconfig libX11 mesa mkfontscale xserver git update 11 jan 2013 Conflicts: mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/.gitignore mesalib/src/mesa/program/.gitignore
Diffstat (limited to 'mesalib/src/mesa/main/get_hash_generator.py')
-rw-r--r--mesalib/src/mesa/main/get_hash_generator.py8
1 files changed, 7 insertions, 1 deletions
diff --git a/mesalib/src/mesa/main/get_hash_generator.py b/mesalib/src/mesa/main/get_hash_generator.py
index 4b3f5f490..04bf9ffe6 100644
--- a/mesalib/src/mesa/main/get_hash_generator.py
+++ b/mesalib/src/mesa/main/get_hash_generator.py
@@ -44,7 +44,7 @@ prime_factor = 89
prime_step = 281
hash_table_size = 1024
-gl_apis=set(["GL", "GL_CORE", "GLES", "GLES2"])
+gl_apis=set(["GL", "GL_CORE", "GLES", "GLES2", "GLES3"])
def print_header():
print "typedef const unsigned short table_t[%d];\n" % (hash_table_size)
@@ -67,6 +67,7 @@ api_enum = [
'GLES',
'GLES2',
'GL_CORE',
+ 'GLES3', # Not in gl_api enum in mtypes.h
]
def api_index(api):
@@ -166,6 +167,9 @@ def generate_hash_tables(enum_list, enabled_apis, param_descriptors):
for api in valid_apis:
add_to_hash_table(tables[api], hash_val, len(params))
+ # Also add GLES2 items to the GLES3 hash table
+ if api == "GLES2":
+ add_to_hash_table(tables["GLES3"], hash_val, len(params))
params.append(["GL_" + enum_name, param[1]])
@@ -183,6 +187,8 @@ def opt_to_apis(feature):
apis = set([_map[feature]])
if "GL" in apis:
apis.add("GL_CORE")
+ if "GLES2" in apis:
+ apis.add("GLES3")
return apis