commit 3ffda65a67739da6b48c085ce9b4eb64d5abe1a9
author Courtney Goeltzenleuchter <courtney@LunarG.com> Mon Apr 13 14:33:40 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:25 2015 +0800
tree f3d74990eba43261ba05b911b60a9a7fdfd3093f
parent 9a1ded8db7886c436fa4f8f64a97df67a695c7cc

FIXUP: Add glave support for xglCmdClearColor patch

4559a6c90cdfc55ae94b0c5b9b9d0841031aa3d0 xgl: combine xglCmdClearColor* into one function

layers/glave_snapshot.c

diff --git a/layers/glave_snapshot.c b/layers/glave_snapshot.c
index 2f645a5..b14b493 100644
--- a/layers/glave_snapshot.c
+++ b/layers/glave_snapshot.c
@@ -1498,7 +1498,7 @@
     nextTable.CmdFillBuffer(cmdBuffer, destBuffer, destOffset, fillSize, data);
 }
 
-XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const float color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
+XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImage(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, XGL_CLEAR_COLOR color, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
 {
     loader_platform_thread_lock_mutex(&objLock);
     ll_increment_use_count((void*)cmdBuffer, XGL_OBJECT_TYPE_CMD_BUFFER);
@@ -1506,14 +1506,6 @@
     nextTable.CmdClearColorImage(cmdBuffer, image, color, rangeCount, pRanges);
 }
 
-XGL_LAYER_EXPORT void XGLAPI xglCmdClearColorImageRaw(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, const uint32_t color[4], uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
-{
-    loader_platform_thread_lock_mutex(&objLock);
-    ll_increment_use_count((void*)cmdBuffer, XGL_OBJECT_TYPE_CMD_BUFFER);
-    loader_platform_thread_unlock_mutex(&objLock);
-    nextTable.CmdClearColorImageRaw(cmdBuffer, image, color, rangeCount, pRanges);
-}
-
 XGL_LAYER_EXPORT void XGLAPI xglCmdClearDepthStencil(XGL_CMD_BUFFER cmdBuffer, XGL_IMAGE image, float depth, uint32_t stencil, uint32_t rangeCount, const XGL_IMAGE_SUBRESOURCE_RANGE* pRanges)
 {
     loader_platform_thread_lock_mutex(&objLock);

tools/glave/scripts/vk_generate.py

diff --git a/tools/glave/scripts/vk_generate.py b/tools/glave/scripts/vk_generate.py
index 11d2ced..3c9f582 100755
--- a/tools/glave/scripts/vk_generate.py
+++ b/tools/glave/scripts/vk_generate.py
@@ -186,7 +186,7 @@
             if 'Dbg' not in proto.name and 'Wsi' not in proto.name:
                 func_ptr_assign.append('extern %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))