From 33131ad24d3b77db78edcf5e149d4b60a1ae825a Mon Sep 17 00:00:00 2001
From: Matthias Clasen <mclasen@redhat.com>
Date: Fri, 26 Jul 2024 07:23:18 -0400
Subject: [PATCH] gpu: Fix the cicp conversion shader for ngl

The compiler was unhappy with using signed labels with an unsigned
variable in a switch. Talk about being picky.
---
 gsk/gpu/shaders/gskgpuconvertcicp.glsl | 56 +++++++++++++-------------
 1 file changed, 28 insertions(+), 28 deletions(-)

diff --git a/gsk/gpu/shaders/gskgpuconvertcicp.glsl b/gsk/gpu/shaders/gskgpuconvertcicp.glsl
index 08e34ee9d1..e295be7b9d 100644
--- a/gsk/gpu/shaders/gskgpuconvertcicp.glsl
+++ b/gsk/gpu/shaders/gskgpuconvertcicp.glsl
@@ -95,12 +95,12 @@ cicp_to_xyz (uint cp)
 {
   switch (cp)
     {
-    case 1: return srgb_to_xyz;
-    case 5: return pal_to_xyz;
-    case 6: return ntsc_to_xyz;
-    case 9: return rec2020_to_xyz;
-    case 10: return identity;
-    case 12: return p3_to_xyz;
+    case 1u: return srgb_to_xyz;
+    case 5u: return pal_to_xyz;
+    case 6u: return ntsc_to_xyz;
+    case 9u: return rec2020_to_xyz;
+    case 10u: return identity;
+    case 12u: return p3_to_xyz;
     default: return identity;
     }
 }
@@ -110,12 +110,12 @@ cicp_from_xyz (uint cp)
 {
   switch (cp)
     {
-    case 1: return xyz_to_srgb;
-    case 5: return xyz_to_pal;
-    case 6: return xyz_to_ntsc;
-    case 9: return xyz_to_rec2020;
-    case 10: return identity;
-    case 12: return xyz_to_p3;
+    case 1u: return xyz_to_srgb;
+    case 5u: return xyz_to_pal;
+    case 6u: return xyz_to_ntsc;
+    case 9u: return xyz_to_rec2020;
+    case 10u: return identity;
+    case 12u: return xyz_to_p3;
     default: return identity;
     }
 }
@@ -208,28 +208,28 @@ apply_cicp_eotf (vec3 color,
 {
   switch (transfer_function)
     {
-    case 1:
-    case 6:
-    case 14:
-    case 15:
+    case 1u:
+    case 6u:
+    case 14u:
+    case 15u:
       return vec3 (bt709_eotf (color.r),
                    bt709_eotf (color.g),
                    bt709_eotf (color.b));
 
-    case 8:
+    case 8u:
       return color;
 
-    case 13:
+    case 13u:
       return vec3 (srgb_eotf (color.r),
                    srgb_eotf (color.g),
                    srgb_eotf (color.b));
 
-    case 16:
+    case 16u:
       return vec3 (pq_eotf (color.r),
                    pq_eotf (color.g),
                    pq_eotf (color.b));
 
-    case 18:
+    case 18u:
       return vec3 (hlg_eotf (color.r),
                    hlg_eotf (color.g),
                    hlg_eotf (color.b));
@@ -245,28 +245,28 @@ apply_cicp_oetf (vec3 color,
 {
   switch (transfer_function)
     {
-    case 1:
-    case 6:
-    case 14:
-    case 15:
+    case 1u:
+    case 6u:
+    case 14u:
+    case 15u:
       return vec3 (bt709_oetf (color.r),
                    bt709_oetf (color.g),
                    bt709_oetf (color.b));
 
-    case 8:
+    case 8u:
       return color;
 
-    case 13:
+    case 13u:
       return vec3 (srgb_oetf (color.r),
                    srgb_oetf (color.g),
                    srgb_oetf (color.b));
 
-    case 16:
+    case 16u:
       return vec3 (pq_oetf (color.r),
                    pq_oetf (color.g),
                    pq_oetf (color.b));
 
-    case 18:
+    case 18u:
       return vec3 (hlg_oetf (color.r),
                    hlg_oetf (color.g),
                    hlg_oetf (color.b));