From 6d6390d0a465cf82f79334aa348d4ac91cfe5103 Mon Sep 17 00:00:00 2001
From: Cameron Cawley <ccawley2011@gmail.com>
Date: Tue, 28 Jan 2025 23:27:24 +0000
Subject: [PATCH] Remove leftover Vulkan header checks

---
 .github/workflows/main.yml | 2 +-
 CMakeLists.txt             | 8 +++-----
 mojoshader.h               | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 5a14d45..5da37b6 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -22,7 +22,7 @@ jobs:
       if: runner.os == 'Linux'
       run: |
         sudo apt-get update
-        sudo apt-get install cmake ninja-build lemon re2c libvulkan-dev
+        sudo apt-get install cmake ninja-build lemon re2c
     - name: Get MojoShader sources
       uses: actions/checkout@v3
     - name: Configure CMake
diff --git a/CMakeLists.txt b/CMakeLists.txt
index a863238..99946ee 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -5,7 +5,6 @@ PROJECT(MojoShader)
 
 INCLUDE(CheckIncludeFile)
 CHECK_INCLUDE_FILE(d3d11.h HAS_D3D11_H)
-CHECK_INCLUDE_FILE(vulkan/vulkan.h HAS_VULKAN_H)
 
 OPTION(BUILD_SHARED_LIBS "Build MojoShader as a shared library" OFF)
 OPTION(PROFILE_D3D "Build MojoShader with support for the D3D profile" ON)
@@ -17,8 +16,8 @@ OPTION(PROFILE_GLSL "Build MojoShader with support for the GLSL profile" ON)
 OPTION(PROFILE_ARB1 "Build MojoShader with support for the ARB1 profile" ON)
 OPTION(PROFILE_ARB1_NV "Build MojoShader with support for the ARB1_NV profile" ON)
 OPTION(PROFILE_METAL "Build MojoShader with support for the Metal profile" APPLE)
-OPTION(PROFILE_SPIRV "Build MojoShader with support for the SPIR-V profile" HAS_VULKAN_H)
-OPTION(PROFILE_GLSPIRV "Build MojoShader with support for the ARB_gl_spirv profile" HAS_VULKAN_H)
+OPTION(PROFILE_SPIRV "Build MojoShader with support for the SPIR-V profile" ON)
+OPTION(PROFILE_GLSPIRV "Build MojoShader with support for the ARB_gl_spirv profile" ON)
 OPTION(EFFECT_SUPPORT "Build MojoShader with support for Effect framework files" ON)
 OPTION(COMPILER_SUPPORT "Build MojoShader with support for HLSL source files" !WIN32) # TODO: Fix lemon on Windows
 OPTION(FLIP_VIEWPORT "Build MojoShader with the ability to flip the GL viewport" OFF)
@@ -200,9 +199,8 @@ IF(BUILD_SHARED_LIBS)
     TARGET_LINK_LIBRARIES(mojoshader ${LIBM} ${LOBJC} ${CARBON_FRAMEWORK})
 ENDIF(BUILD_SHARED_LIBS)
 
-# These are fallback paths for Vulkan/D3D11, try to have this on the system instead!
+# These are fallback paths for D3D11, try to have this on the system instead!
 TARGET_INCLUDE_DIRECTORIES(mojoshader PUBLIC
-    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../Vulkan-Headers/include>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dxvk-native/include/native/directx>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dxvk-native/include/native/windows>
     $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/../dxvk-native/include/native/wsi>
diff --git a/mojoshader.h b/mojoshader.h
index 4710a58..0bcfadc 100644
--- a/mojoshader.h
+++ b/mojoshader.h
@@ -3792,7 +3792,7 @@ DECLSPEC void MOJOSHADER_sdlGetBoundShaderData(MOJOSHADER_sdlContext *ctx,
 
 /*
  * Fills register pointers with pointers that are directly used to push uniform
- *  data to the Vulkan shader context.
+ *  data to the SDL3 shader context.
  *
  * This function is really just for the effects API, you should NOT be using
  *  this unless you know every single line of MojoShader from memory.