commit 9a1ded8db7886c436fa4f8f64a97df67a695c7cc
author Courtney Goeltzenleuchter <courtney@LunarG.com> Fri Apr 03 16:35:32 2015 -0600
committer Chia-I Wu <olv@lunarg.com> Thu Apr 16 17:33:25 2015 +0800
tree 0fc7876039dc65584379111d716e604eded6f0a5
parent 29f1c2597e6380e1cc9384c98fef724ad225b7bd

xgl: combine xglCmdClearColor* into one function

combined the two xglCmdClearColorImage* functions into one,
with the XGL_CLEAR_COLOR struct

bug # 13172
alpha header: r29626

tests/blit_tests.cpp

diff --git a/tests/blit_tests.cpp b/tests/blit_tests.cpp
index 3ba6b5e..2371e11 100644
--- a/tests/blit_tests.cpp
+++ b/tests/blit_tests.cpp
@@ -1332,16 +1332,16 @@
         return raw;
     }
 
-    std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const Color &color)
+    std::vector<uint8_t> color_to_raw(XGL_FORMAT format, const XGL_CLEAR_COLOR &color)
     {
-        if (test_raw_)
-            return color_to_raw(format, color.raw);
+        if (color.useRawValue)
+            return color_to_raw(format, color.color.rawColor);
         else
-            return color_to_raw(format, color.color);
+            return color_to_raw(format, color.color.floatColor);
     }
 
     void test_clear_color_image(const XGL_IMAGE_CREATE_INFO &img_info,
-                                const Color &color,
+                                const XGL_CLEAR_COLOR &clear_color,
                                 const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
     {
         xgl_testing::Image img;
@@ -1394,11 +1394,7 @@
         pipeline_barrier.ppMemBarriers = (const void **)&p_to_clear[0];
         xglCmdPipelineBarrier(cmd_.obj(), &pipeline_barrier);
 
-        if (test_raw_) {
-            xglCmdClearColorImageRaw(cmd_.obj(), img.obj(), color.raw, ranges.size(), &ranges[0]);
-        } else {
-            xglCmdClearColorImage(cmd_.obj(), img.obj(), color.color, ranges.size(), &ranges[0]);
-        }
+        xglCmdClearColorImage(cmd_.obj(), img.obj(), clear_color, ranges.size(), &ranges[0]);
 
         pipeline_barrier.sType = XGL_STRUCTURE_TYPE_PIPELINE_BARRIER;
         pipeline_barrier.eventCount = 1;
@@ -1418,7 +1414,7 @@
 
         xgl_testing::ImageChecker checker(img_info, ranges);
 
-        const std::vector<uint8_t> solid_pattern = color_to_raw(img_info.format, color);
+        const std::vector<uint8_t> solid_pattern = color_to_raw(img_info.format, clear_color);
         if (solid_pattern.empty())
             return;
 
@@ -1430,8 +1426,8 @@
                                 const float color[4],
                                 const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
     {
-        Color c;
-        memcpy(c.color, color, sizeof(c.color));
+        XGL_CLEAR_COLOR c = {};
+        memcpy(c.color.floatColor, color, sizeof(c.color.floatColor));
         test_clear_color_image(img_info, c, ranges);
     }
 };
@@ -1465,8 +1461,9 @@
                                     const uint32_t color[4],
                                     const std::vector<XGL_IMAGE_SUBRESOURCE_RANGE> &ranges)
     {
-        Color c;
-        memcpy(c.raw, color, sizeof(c.raw));
+        XGL_CLEAR_COLOR c = {};
+        c.useRawValue = true;
+        memcpy(c.color.rawColor, color, sizeof(c.color.rawColor));
         test_clear_color_image(img_info, c, ranges);
     }
 };