commit e3105972bfdc54e2cca65acf44d4ffa8d85881f5
author Chris Forbes <chrisf@ijw.co.nz> Wed Jun 24 14:34:53 2015 +1200
committer Chris Forbes <chrisf@ijw.co.nz> Tue Jul 07 14:54:05 2015 +1200
tree 0aca6da85902e410ee7b100b58876dd0369ec848
parent 1e16cb80a60551f41801f2951795951217b3aeaa

vulkan.h: v129 -- rework clear colors, remove raw clear [#14020]

Signed-off-by: Chris Forbes <chrisf@ijw.co.nz>

icd/intel/cmd_meta.c

diff --git a/icd/intel/cmd_meta.c b/icd/intel/cmd_meta.c
index 3d05322..d584274 100644
--- a/icd/intel/cmd_meta.c
+++ b/icd/intel/cmd_meta.c
@@ -898,7 +898,7 @@
     VkCmdBuffer                         cmdBuffer,
     VkImage                             image,
     VkImageLayout                       imageLayout,
-    const VkClearColor                 *pClearColor,
+    const VkClearColorValue            *pClearColor,
     uint32_t                            rangeCount,
     const VkImageSubresourceRange      *pRanges)
 {
@@ -914,16 +914,11 @@
     meta.shader_id = INTEL_DEV_META_FS_CLEAR_COLOR;
     meta.samples = img->samples;
 
-    if (pClearColor->useRawValue) {
-        icd_format_get_raw_value(img->layout.format, pClearColor->color.rawColor, meta.clear_val);
-        format = cmd_meta_img_raw_format(cmd, img->layout.format);
-    } else {
-        meta.clear_val[0] = u_fui(pClearColor->color.floatColor[0]);
-        meta.clear_val[1] = u_fui(pClearColor->color.floatColor[1]);
-        meta.clear_val[2] = u_fui(pClearColor->color.floatColor[2]);
-        meta.clear_val[3] = u_fui(pClearColor->color.floatColor[3]);
-        format = img->layout.format;
-    }
+    meta.clear_val[0] = pClearColor->u32[0];
+    meta.clear_val[1] = pClearColor->u32[1];
+    meta.clear_val[2] = pClearColor->u32[2];
+    meta.clear_val[3] = pClearColor->u32[3];
+    format = img->layout.format;
 
     for (i = 0; i < rangeCount; i++) {
         cmd_meta_clear_image(cmd, img, format, &meta, &pRanges[i]);
@@ -934,7 +929,7 @@
     VkCmdBuffer                         cmdBuffer,
     VkImage                             image,
     VkImageLayout                       imageLayout,
-    const VkClearColor                 *pClearColor,
+    const VkClearColorValue            *pClearColor,
     uint32_t                            rangeCount,
     const VkImageSubresourceRange      *pRanges)
 {
@@ -993,7 +988,7 @@
     VkCmdBuffer                             cmdBuffer,
     uint32_t                                colorAttachment,
     VkImageLayout                           imageLayout,
-    const VkClearColor                     *pColor,
+    const VkClearColorValue                *pColor,
     uint32_t                                rectCount,
     const VkRect3D                         *pRects)
 {