aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobin Ehlis <tobin@lunarg.com>2014-12-18 08:44:01 -0700
committerCourtney Goeltzenleuchter <courtney@LunarG.com>2015-02-04 17:58:05 -0700
commitef8e8d34c8d95611d96e206bedda4aef101d6f95 (patch)
tree153a28e4be8ba8daaeadf7b6321a4c42ae98db25
parentad0170c34eef4e8ee453cc0e0b3facace2e73bf5 (diff)
downloadusermoji-ef8e8d34c8d95611d96e206bedda4aef101d6f95.tar.xz
layers: Add ENUM param checks to "gpu" funcs
-rwxr-xr-xxgl-layer-generate.py10
1 files changed, 2 insertions, 8 deletions
diff --git a/xgl-layer-generate.py b/xgl-layer-generate.py
index 7e2cb742..76e59248 100755
--- a/xgl-layer-generate.py
+++ b/xgl-layer-generate.py
@@ -641,7 +641,6 @@ class Subcommand(object):
param_checks.append(' char str[1024];')
str_decl = True
param_checks.append(' if (!validate_%s(%s)) {' % (p.ty, p.name))
- param_checks.append(' char str[1024];')
param_checks.append(' sprintf(str, "Parameter %s to function %s has invalid value of %%i.", (int)%s);' % (p.name, proto.name, p.name))
param_checks.append(' layerCbMsg(XGL_DBG_MSG_ERROR, XGL_VALIDATION_LEVEL_0, NULL, 0, 1, "PARAMCHECK", str);')
param_checks.append(' }')
@@ -703,18 +702,13 @@ class Subcommand(object):
c_call = proto.c_call().replace("(" + proto.params[0].name, "((XGL_PHYSICAL_GPU)gpuw->nextObject", 1)
funcs.append('%s%s\n'
'{\n'
- ' char str[1024];'
' XGL_BASE_LAYER_OBJECT* gpuw = (XGL_BASE_LAYER_OBJECT *) %s;\n'
- ' sprintf(str, "At start of layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, "PARAMCHECK", str);\n'
' pCurObj = gpuw;\n'
' pthread_once(&tabOnce, initLayerTable);\n'
+ '%s\n'
' %snextTable.%s;\n'
- ' sprintf(str, "Completed layered %s\\n");\n'
- ' layerCbMsg(XGL_DBG_MSG_UNKNOWN, XGL_VALIDATION_LEVEL_0, gpuw, 0, 0, "PARAMCHECK", str);\n'
- ' fflush(stdout);\n'
'%s'
- '}' % (qual, decl, proto.params[0].name, proto.name, ret_val, c_call, proto.name, stmt))
+ '}' % (qual, decl, proto.params[0].name, "\n".join(param_checks), ret_val, c_call, stmt))
return "\n\n".join(funcs)