On 21 May 2012 11:08, Pauli Nieminen <<a href="mailto:pauli.nieminen@linux.intel.com" target="_blank">pauli.nieminen@linux.intel.com</a>> wrote: <div class="gmail_quote"><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"> Same function name can be shared between GL, GLES and ARB extension. To allow stub functions to figure out if function is supported in current context in any of categories. </blockquote><div> Would you mind also changing the documentation at the top of parse_glspec.py to reflect the new meaning of the 'category' field? (Note: I also put a copy of this documentation in gen_dispatch.py, but in hindsight that was silly--I would be happy to remove the copy and have gen_dispatch.py just say "this script consumes the JSON data that was output by parse_glspec.py"). </div><blockquote class="gmail_quote" style="margin:0pt 0pt 0pt 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"> Signed-off-by: Pauli Nieminen <<a href="mailto:pauli.nieminen@linux.intel.com">pauli.nieminen@linux.intel.com</a>> --- glapi/parse_glspec.py | 2 +- tests/util/gen_dispatch.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/glapi/parse_glspec.py b/glapi/parse_glspec.py index 3a1c848..f513164 100644 --- a/glapi/parse_glspec.py +++ b/glapi/parse_glspec.py @@ -413,7 +413,7 @@ class Api(object): 'return_type': self.type_translation[attributes['return'][0]], 'param_names': param_names, 'param_types': param_types, - 'category': category, + 'category': [category], } self.synonyms.add_singleton(name) for alias in attributes['alias']: diff --git a/tests/util/gen_dispatch.py b/tests/util/gen_dispatch.py index 96a7f77..345260a 100644 --- a/tests/util/gen_dispatch.py +++ b/tests/util/gen_dispatch.py @@ -314,9 +314,9 @@ class DispatchSet(object): self.cat_fn_pairs = [] for function_name in synonym_set: function = all_functions[function_name] - category_name = function.category - category = all_categories[category_name] - self.cat_fn_pairs.append((category, function)) + for category_name in function.category: + category = all_categories[category_name] + self.cat_fn_pairs.append((category, function)) # Sort by category, with GL categories preceding extensions. self.cat_fn_pairs.sort(key = self.__sort_key) -- 1.7.5.4 _______________________________________________ Piglit mailing list <a href="mailto:Piglit@lists.freedesktop.org">Piglit@lists.freedesktop.org</a> <a href="http://lists.freedesktop.org/mailman/listinfo/piglit" target="_blank">http://lists.freedesktop.org/mailman/listinfo/piglit</a> </blockquote></div>