From 1447d9297d23e3a28c0e4227ca8fcb10c947b3e5 Mon Sep 17 00:00:00 2001
From: Bill Currie <bill@taniwha.org>
Date: Fri, 18 Feb 2022 01:15:38 +0900
Subject: [PATCH] [vulkan] Fix incorrect bsp sky constant ids

I guess I got things a little tangled when cleaning up my bindless
attempt.
Fixes black default skies.
---
 libs/video/renderer/vulkan/qfpipeline.plist    | 6 +++---
 libs/video/renderer/vulkan/shader/bsp_sky.frag | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libs/video/renderer/vulkan/qfpipeline.plist b/libs/video/renderer/vulkan/qfpipeline.plist
index d503ac144..40a28a89a 100644
--- a/libs/video/renderer/vulkan/qfpipeline.plist
+++ b/libs/video/renderer/vulkan/qfpipeline.plist
@@ -793,11 +793,11 @@
 					specializationInfo = {
 						mapEntries = (
 							// doSkyBox
-							{ size = 4; offset = 4; constantID = 0; },
+							{ size = 4; offset = 0; constantID = 0; },
 							// doSkySheet
-							{ size = 4; offset = 0; constantID = 1; },
+							{ size = 4; offset = 4; constantID = 1; },
 						);
-						data = "array(0, 1)";
+						data = "array(1, 0)";
 					};
 				},
 			);
diff --git a/libs/video/renderer/vulkan/shader/bsp_sky.frag b/libs/video/renderer/vulkan/shader/bsp_sky.frag
index 25ccf9ba0..357d5d55b 100644
--- a/libs/video/renderer/vulkan/shader/bsp_sky.frag
+++ b/libs/video/renderer/vulkan/shader/bsp_sky.frag
@@ -1,7 +1,7 @@
 #version 450
 
-layout (constant_id = 1) const bool doSkyBox = false;
-layout (constant_id = 2) const bool doSkySheet = false;
+layout (constant_id = 0) const bool doSkyBox = false;
+layout (constant_id = 1) const bool doSkySheet = false;
 
 layout (set = 1, binding = 0) uniform sampler2DArray SkySheet;
 layout (set = 2, binding = 0) uniform samplerCube SkyBox;