Merge "DEPTH_STENCIL_OES as tex format requires OES_depth_texture" into nougat-cts...

[platform/upstream/VK-GL-CTS.git] / scripts / opengl / gen_query_util.py

diff --git a/scripts/opengl/gen_query_util.py b/scripts/opengl/gen_query_util.py
index ea9b280..36f41ec 100644 (file)
--- a/scripts/opengl/gen_query_util.py
+++ b/scripts/opengl/gen_query_util.py
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------
 
 from src_util import *
-from khr_util.gen_str_util import genEnumUtilImpls
+from khr_util.gen_str_util import genSetEnumUtilImpls, genQueryEnumUtilImpls
 
 QUERY_NUM_OUT_ARGUMENTS = [
 
@@ -38,19 +38,42 @@ QUERY_NUM_OUT_ARGUMENTS = [
                ("PRIMITIVE_BOUNDING_BOX_EXT",          8),
                ]),
 
+       ("Indexed", [
+               ("COLOR_WRITEMASK",                             4),
+               ]),
+
        ("Attribute", [
                ("CURRENT_VERTEX_ATTRIB",               4),
                ]),
+
+       ("Program", [
+               ("COMPUTE_WORK_GROUP_SIZE",             3),
+               ]),
+
+       ("TextureParam", [
+               ("TEXTURE_BORDER_COLOR",                4),
+               ]),
 ]
 
+SET_NUM_IN_ARGUMENTS = [
+       ("TextureParam", [
+               ("TEXTURE_BORDER_COLOR",                4),
+               ]),
+]
+
+
 def addNamePrefix (prefix, groups):
        return [(groupName, [(prefix + queryName, querySize) for queryName, querySize in groupQueries]) for groupName, groupQueries in groups]
 
 def genQueryUtil (iface):
        queryNumOutArgs = addNamePrefix("GL_", QUERY_NUM_OUT_ARGUMENTS);
+       setNumInArgs    = addNamePrefix("GL_", SET_NUM_IN_ARGUMENTS);
+
        utilFile = os.path.join(OPENGL_DIR, "gluQueryUtil.inl")
+       writeInlFile(utilFile, genQueryEnumUtilImpls(iface, queryNumOutArgs))
 
-       writeInlFile(utilFile, genEnumUtilImpls(iface, queryNumOutArgs))
+       utilFile = os.path.join(OPENGL_DIR, "gluCallLogUtil.inl")
+       writeInlFile(utilFile, genSetEnumUtilImpls(iface, setNumInArgs))
 
 if __name__ == "__main__":
        genQueryUtil(getHybridInterface())