Simplify uniform type table texture type.

We can use Python's "endswith" more easily than using the current checks. BUG=angleproject:1390 BUG=angleproject:2167 Change-Id: I5a35602c91b989270cff1d42a9d5ede542039fbd Reviewed-on: https://chromium-review.googlesource.com/717188Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>

Simplify uniform type table texture type.
22d7f1f3 · Jamie Madill · Commit Bot · f6d242ed · 22d7f1f3
Commit 22d7f1f3 authored Oct 12, 2017 by Jamie Madill Committed by Commit Bot Oct 12, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 6 deletions

gen_uniform_type_table.py src/common/gen_uniform_type_table.py +3 -6

No files found.
--- a/src/common/gen_uniform_type_table.py
+++ b/src/common/gen_uniform_type_table.py
@@ -155,12 +155,9 @@ def get_component_type(uniform_type):
        return "GL_INT"
 def get_texture_type(uniform_type):
-    if "SAMPLER" in uniform_type:
+    for sampler_type, tex_type in texture_types.items():
-        index = uniform_type.find("SAMPLER") + len("SAMPLER") + 1
+        if uniform_type.endswith(sampler_type):
-        return "GL_TEXTURE_" + texture_types[uniform_type[index:]]
+            return "GL_TEXTURE_" + tex_type
-    if "IMAGE" in uniform_type:
-        index = uniform_type.find("IMAGE") + len("IMAGE") + 1
-        return "GL_TEXTURE_" + texture_types[uniform_type[index:]]
    return "GL_NONE"
 def get_transposed_type(uniform_type):