Remove traces of failed VK experiment

beyond-all-reason · Aug 21, 2023 · 1238ab0 · 1238ab0
1 parent ccc1fe7
commit 1238ab0
Show file tree

Hide file tree

Showing 10 changed files with 0 additions and 295 deletions.
diff --git a/docker-build/Dockerfile b/docker-build/Dockerfile
@@ -104,13 +104,6 @@ ENV CCACHE_DIR=/ccache
 ENV CCACHE_CONFIGPATH=/etc/ccache.conf
 ENV PATH="/usr/lib/ccache:${PATH}"
 
-# Install Vulkan SDK
-RUN apt install wget; \
-	wget -q https://sdk.lunarg.com/sdk/download/latest/linux/vulkan-sdk.tar.gz; \
-	mkdir /vulkan-sdk && tar -xf vulkan-sdk.tar.gz --strip-components=1 -C /vulkan-sdk; \
-	rm -rf vulkan-sdk.tar.gz
-
-
 COPY scripts /scripts
 ENV PATH="/scripts:${PATH}"
 

diff --git a/docker-build/scripts/02_configure.sh b/docker-build/scripts/02_configure.sh
@@ -22,8 +22,6 @@ if [ "${PLATFORM}" == "linux-64" ]; then
 elif [ "${PLATFORM}" == "windows-64" ]; then
     EXTRA_CMAKE_ARGS+=(
         -DMINGWLIBS=${LIBS_DIR}
-        -DVulkan_INCLUDE_DIR=/vulkan-sdk/x86_64/include
-        -DVulkan_LIBRARY=/vulkan-sdk/x86_64/lib
     )
 fi
 

diff --git a/docker-build/scripts/entrypoint.sh b/docker-build/scripts/entrypoint.sh
@@ -1,4 +1,3 @@
-source /vulkan-sdk/setup-env.sh
 COMMAND=$1
 shift
 

diff --git a/rts/Rendering/CMakeLists.txt b/rts/Rendering/CMakeLists.txt
@@ -65,8 +65,6 @@ set(sources_engine_Rendering
 		"${CMAKE_CURRENT_SOURCE_DIR}/GL/glExtra.cpp"
 		"${CMAKE_CURRENT_SOURCE_DIR}/GL/State.cpp"
 		"${CMAKE_CURRENT_SOURCE_DIR}/GL/myGL.cpp"
-		"${CMAKE_CURRENT_SOURCE_DIR}/VK/VkInit.cpp"
-		"${CMAKE_CURRENT_SOURCE_DIR}/VK/VkInfo.cpp"
 		"${CMAKE_CURRENT_SOURCE_DIR}/GlobalRendering.cpp"
 		"${CMAKE_CURRENT_SOURCE_DIR}/GroundFlash.cpp"
 		"${CMAKE_CURRENT_SOURCE_DIR}/CommandDrawer.cpp"

diff --git a/rts/Rendering/GlobalRendering.cpp b/rts/Rendering/GlobalRendering.cpp
@@ -13,7 +13,6 @@
 #include "Rendering/GL/RenderBuffers.h"
 #include "Rendering/GL/myGL.h"
 #include "Rendering/GL/FBO.h"
-#include "Rendering/VK/VkInfo.h"
 #include "Rendering/UniformConstants.h"
 #include "Rendering/Fonts/glFont.h"
 #include "System/bitops.h"
@@ -612,8 +611,6 @@ void CGlobalRendering::PostInit() {
 	glewExperimental = true;
 	#endif
 
-	//VkInfo::PrintInfo();
-
 	glewInit();
 	// glewInit sets GL_INVALID_ENUM, get rid of it
 	glGetError();

diff --git a/rts/Rendering/VK/VkInfo.cpp b/rts/Rendering/VK/VkInfo.cpp
diff --git a/rts/Rendering/VK/VkInfo.h b/rts/Rendering/VK/VkInfo.h
diff --git a/rts/Rendering/VK/VkInit.cpp b/rts/Rendering/VK/VkInit.cpp
diff --git a/rts/Rendering/VK/VkInit.h b/rts/Rendering/VK/VkInit.h
diff --git a/rts/builds/legacy/CMakeLists.txt b/rts/builds/legacy/CMakeLists.txt
@@ -16,12 +16,6 @@ if("${SDL2_VERSION_STRING}" VERSION_LESS "2")
 	message(FATAL_ERROR "Found SDL v${SDL2_VERSION_STRING} while 2 is required!")
 endif()
 
-find_package(Vulkan)
-if    (Vulkan_FOUND)
-	list(APPEND engineIncludes ${Vulkan_INCLUDE_DIRS})
-	add_definitions(-DHAS_VULKAN)
-endif (Vulkan_FOUND)
-
 set(OpenGL_GL_PREFERENCE LEGACY)
 find_package_static(OpenGL REQUIRED)
 find_package_static(GLEW 1.5.1 REQUIRED)