commit 1459a4523cf1c06ef7d413adf2ba9a8bc8a98d9a
author Mika Isojärvi <misojarvi@google.com> Mon Mar 09 14:10:33 2015 -0700
committer Jarkko Poyry <jpoyry@google.com> Mon Mar 09 21:30:07 2015 +0000
tree 6f3433c81e732b0a1d721ea9383e7e7e1a9e0124
parent c15ff80ac6c2db9ba6d1b57cd0fe01ddb867cbaf

Improve logging of indexed enable and disable calls.

Change-Id: Iddf92e228c2843b06fc89ca181db3d3a07e8c6f1

scripts/opengl/gen_call_log_wrapper.py

diff --git a/scripts/opengl/gen_call_log_wrapper.py b/scripts/opengl/gen_call_log_wrapper.py
index f13d7bb..84bf266 100644
--- a/scripts/opengl/gen_call_log_wrapper.py
+++ b/scripts/opengl/gen_call_log_wrapper.py
@@ -95,6 +95,7 @@
 	"glDeleteProgramPipelines":				LogSpec({1: pointer(size = "n")}),
 	"glDepthFunc":							LogSpec({0: enum("CompareFunc")}),
 	"glDisable":							LogSpec({0: enum("EnableCap")}),
+	"glDisablei":							LogSpec({0: enum("IndexedEnableCap")}),
 	"glDrawArrays":							LogSpec({0: enum("PrimitiveType")}),
 	"glDrawArraysInstanced":				LogSpec({0: enum("PrimitiveType")}),
 	"glDrawBuffers":						LogSpec({1: enumPointer("DrawReadBuffer", size = "n")}),
@@ -110,6 +111,7 @@
 	"glMultiDrawElements":					LogSpec({0: enum("PrimitiveType"), 2: enum("Type")}),
 	"glMultiDrawElementsBaseVertex":		LogSpec({0: enum("PrimitiveType"), 2: enum("Type")}),
 	"glEnable":								LogSpec({0: enum("EnableCap")}),
+	"glEnablei":							LogSpec({0: enum("IndexedEnableCap")}),
 	"glEndQuery":							LogSpec({0: enum("QueryTarget")}),
 	"glFramebufferRenderbuffer":			LogSpec({0: enum("FramebufferTarget"), 1: enum("FramebufferAttachment"), 2: enum("FramebufferTarget")}),
 	"glFramebufferTexture2D":				LogSpec({0: enum("FramebufferTarget"), 1: enum("FramebufferAttachment"), 2: enum("TextureTarget")}),
@@ -202,6 +204,7 @@
 #	"glGetVertexAttribPointerv":
 	"glHint":								LogSpec({0: enum("Hint"), 1: enum("HintMode")}),
 	"glIsEnabled":							LogSpec({0: enum("EnableCap")}),
+	"glIsEnabledi":							LogSpec({0: enum("IndexedEnableCap")}),
 	"glPixelStorei":						LogSpec({0: enum("PixelStoreParameter")}),
 	"glReadBuffer":							LogSpec({0: enum("DrawReadBuffer")}),
 	"glReadPixels":							LogSpec({4: enum("PixelFormat"), 5: enum("Type")}),

scripts/opengl/gen_str_util.py

diff --git a/scripts/opengl/gen_str_util.py b/scripts/opengl/gen_str_util.py
index 0fe7f95..c6b1517 100644
--- a/scripts/opengl/gen_str_util.py
+++ b/scripts/opengl/gen_str_util.py
@@ -328,6 +328,9 @@
 							 "PRIMITIVE_RESTART", "SAMPLE_MASK", "DEBUG_OUTPUT", "DEBUG_OUTPUT_SYNCHRONOUS",
 							 "BLEND_ADVANCED_COHERENT_KHR"]),
 
+	# Indexed enable-disable bit
+	("IndexedEnableCap",	["BLEND"]),
+
 	# Polygon winding
 	("Winding",				["CW", "CCW"]),
 
@@ -788,7 +791,13 @@
 		"IMAGE_BINDING_LAYER",
 		"IMAGE_BINDING_ACCESS",
 		"IMAGE_BINDING_FORMAT",
-		"BLEND_EQUATION",
+		"BLEND_EQUATION_RGB",
+		"BLEND_EQUATION_ALPHA",
+		"BLEND_SRC_RGB",
+		"BLEND_SRC_ALPHA",
+		"BLEND_DST_RGB",
+		"BLEND_DST_ALPHA",
+		"COLOR_WRITEMASK",
 	]),
 
 	("GettableString", [