xgl: combine xglCmdClearColor* into one function
combined the two xglCmdClearColorImage* functions into one,
with the XGL_CLEAR_COLOR struct
bug # 13172
alpha header: r29626
diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index 829eb54..11d2ced 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -199,7 +199,7 @@
if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
func_ptr_assign.append('%s( XGLAPI * real_xgl%s)(' % (proto.ret, proto.name))
for p in proto.params:
- if 'color' == p.name:
+ if 'color' == p.name and 'XGL_CLEAR_COLOR' != p.ty:
func_ptr_assign.append(' %s %s[4],' % (p.ty.replace('[4]', ''), p.name))
else:
func_ptr_assign.append(' %s %s,' % (p.ty, p.name))
@@ -658,6 +658,9 @@
if last_param == True:
func_str += '%s%s = %s)' % (ptr, p.name, pft)
print_vals += ', %s' % (pfi)
+ elif 'XGL_CLEAR_COLOR' == p.ty:
+ func_str += '%s%s = %s, ' % (ptr, p.name, pft)
+ print_vals += ', (void *) &pPacket->%s' % (p.name)
else:
func_str += '%s%s = %s, ' % (ptr, p.name, pft)
print_vals += ', %s' % (pfi)