From b6a09517c28aaca934ab50bdceaa9e596c6b1aa1 Mon Sep 17 00:00:00 2001
From: cosmonaut <evan@moonside.games>
Date: Tue, 9 Feb 2021 22:51:49 -0800
Subject: [PATCH] change clear color type

---
 include/Refresh.h           | 12 ++----------
 src/Refresh.c               |  4 ++--
 src/Refresh_Driver.h        |  4 ++--
 src/Refresh_Driver_Vulkan.c | 20 ++++++++++----------
 4 files changed, 16 insertions(+), 24 deletions(-)

diff --git a/include/Refresh.h b/include/Refresh.h
index 02748b5..ee29c19 100644
--- a/include/Refresh.h
+++ b/include/Refresh.h
@@ -354,14 +354,6 @@ typedef enum Refresh_BorderColor
 
 /* Structures */
 
-typedef struct Refresh_Color
-{
-	uint8_t r;
-	uint8_t g;
-	uint8_t b;
-	uint8_t a;
-} Refresh_Color;
-
 typedef struct Refresh_DepthStencilValue
 {
 	float depth;
@@ -751,7 +743,7 @@ REFRESHAPI void Refresh_Clear(
 	Refresh_CommandBuffer *commandBuffer,
 	Refresh_Rect *clearRect,
 	Refresh_ClearOptions options,
-	Refresh_Color *colors,
+	Refresh_Vec4 *colors,
 	uint32_t colorCount,
 	Refresh_DepthStencilValue depthStencil
 );
@@ -1183,7 +1175,7 @@ REFRESHAPI void Refresh_BeginRenderPass(
 	Refresh_RenderPass *renderPass,
 	Refresh_Framebuffer *framebuffer,
 	Refresh_Rect *renderArea,
-	Refresh_Color *pColorClearValues,
+	Refresh_Vec4 *pColorClearValues,
 	uint32_t colorClearCount,
 	Refresh_DepthStencilValue *depthStencilClearValue
 );
diff --git a/src/Refresh.c b/src/Refresh.c
index 906e8ce..4e6c1c4 100644
--- a/src/Refresh.c
+++ b/src/Refresh.c
@@ -172,7 +172,7 @@ void Refresh_Clear(
 	Refresh_CommandBuffer *commandBuffer,
 	Refresh_Rect *clearRect,
 	Refresh_ClearOptions options,
-	Refresh_Color *colors,
+	Refresh_Vec4 *colors,
 	uint32_t colorCount,
     Refresh_DepthStencilValue depthStencil
 ) {
@@ -659,7 +659,7 @@ void Refresh_BeginRenderPass(
 	Refresh_RenderPass *renderPass,
 	Refresh_Framebuffer *framebuffer,
 	Refresh_Rect *renderArea,
-	Refresh_Color *pColorClearValues,
+	Refresh_Vec4 *pColorClearValues,
 	uint32_t colorClearCount,
 	Refresh_DepthStencilValue *depthStencilClearValue
 ) {
diff --git a/src/Refresh_Driver.h b/src/Refresh_Driver.h
index 1b3e8d1..9490078 100644
--- a/src/Refresh_Driver.h
+++ b/src/Refresh_Driver.h
@@ -172,7 +172,7 @@ struct Refresh_Device
         Refresh_CommandBuffer *commandBuffer,
         Refresh_Rect *clearRect,
         Refresh_ClearOptions options,
-        Refresh_Color *colors,
+        Refresh_Vec4 *colors,
         uint32_t colorCount,
         Refresh_DepthStencilValue depthStencil
 	);
@@ -409,7 +409,7 @@ struct Refresh_Device
         Refresh_RenderPass *renderPass,
         Refresh_Framebuffer *framebuffer,
         Refresh_Rect *renderArea,
-        Refresh_Color *pColorClearValues,
+        Refresh_Vec4 *pColorClearValues,
         uint32_t colorClearCount,
         Refresh_DepthStencilValue *depthStencilClearValue
     );
diff --git a/src/Refresh_Driver_Vulkan.c b/src/Refresh_Driver_Vulkan.c
index a1793eb..2726f18 100644
--- a/src/Refresh_Driver_Vulkan.c
+++ b/src/Refresh_Driver_Vulkan.c
@@ -3832,7 +3832,7 @@ static void VULKAN_Clear(
 	Refresh_CommandBuffer *commandBuffer,
 	Refresh_Rect *clearRect,
 	Refresh_ClearOptions options,
-	Refresh_Color *colors,
+	Refresh_Vec4 *colors,
 	uint32_t colorCount,
 	Refresh_DepthStencilValue depthStencil
 ) {
@@ -3871,10 +3871,10 @@ static void VULKAN_Clear(
 	{
 		for (i = 0; i < colorCount; i += 1)
 		{
-			clearValues[i].color.float32[0] = colors[i].r / 255.0f;
-			clearValues[i].color.float32[1] = colors[i].g / 255.0f;
-			clearValues[i].color.float32[2] = colors[i].b / 255.0f;
-			clearValues[i].color.float32[3] = colors[i].a / 255.0f;
+			clearValues[i].color.float32[0] = colors[i].x;
+			clearValues[i].color.float32[1] = colors[i].y;
+			clearValues[i].color.float32[2] = colors[i].z;
+			clearValues[i].color.float32[3] = colors[i].w;
 		}
 
 		for (i = 0; i < colorCount; i += 1)
@@ -7340,7 +7340,7 @@ static void VULKAN_BeginRenderPass(
 	Refresh_RenderPass *renderPass,
 	Refresh_Framebuffer *framebuffer,
 	Refresh_Rect *renderArea,
-	Refresh_Color *pColorClearValues,
+	Refresh_Vec4 *pColorClearValues,
 	uint32_t colorClearCount,
 	Refresh_DepthStencilValue *depthStencilClearValue
 ) {
@@ -7405,10 +7405,10 @@ static void VULKAN_BeginRenderPass(
 
 	for (i = 0; i < colorClearCount; i += 1)
 	{
-		clearValues[i].color.float32[0] = pColorClearValues[i].r / 255.0f;
-		clearValues[i].color.float32[1] = pColorClearValues[i].g / 255.0f;
-		clearValues[i].color.float32[2] = pColorClearValues[i].b / 255.0f;
-		clearValues[i].color.float32[3] = pColorClearValues[i].a / 255.0f;
+		clearValues[i].color.float32[0] = pColorClearValues[i].x;
+		clearValues[i].color.float32[1] = pColorClearValues[i].y;
+		clearValues[i].color.float32[2] = pColorClearValues[i].z;
+		clearValues[i].color.float32[3] = pColorClearValues[i].w;
 	}
 
 	if (depthStencilClearValue != NULL)