This is never gonna work, might as well push it anyways

melvyn2 · Oct 12, 2020 · a8cd1c4 · a8cd1c4
1 parent 9aafe2f
commit a8cd1c4
Show file tree

Hide file tree

Showing 8 changed files with 98 additions and 12 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(tf2vulkan)
 cmake_minimum_required(VERSION 3.13)
 
 set(CMAKE_C_STANDARD 11)
-set(CMAKE_CXX_STANDARD 11)
+set(CMAKE_CXX_STANDARD 20)
 
 if(UNIX)
     add_compile_definitions(PLATFORM_POSIX POSIX _POSIX)
@@ -18,6 +18,22 @@ if(WIN32)
     add_compile_definitions(PLATFORM_WINDOWS_PC PLATFORM_WINDOWS WIN32 _WIN32)
 endif()
 
+add_compile_definitions(RAD_TELEMETRY_DISABLED)
+add_compile_definitions(_CRT_SECURE_NO_WARNINGS)
+#add_compile_definitions(_PREFAST_)
+add_compile_definitions(TF2VULKAN)
+add_compile_definitions(SUPPRESS_INVALID_PARAMETER_NO_INFO)
+add_compile_definitions(VERSION_SAFE_STEAM_API_INTERFACES)
+add_compile_definitions(CLIENT_DLL)
+add_compile_definitions(TF2_SDK)
+add_compile_definitions(TF_CLIENT_DLL)
+add_compile_definitions(GLOWS_ENABLE)
+add_compile_definitions(NO_PCH)
+add_compile_definitions(_X86_)
+add_compile_definitions(MOVE_CONSTRUCTOR_SUPPORT)
+add_compile_definitions(USES_ECON_ITEMS)
+add_compile_definitions(NO_MALLOC_OVERRIDE)
+
 
 if (CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
     add_compile_definitions(COMPILER_GCC)  # IDK why but clang == gcc
@@ -30,15 +46,16 @@ endif()
 
 set(CMAKE_POSITION_INDEPENDENT_CODE True)
 
-set(CMAKE_C_FLAGS_DEBUG_INIT -DDEBUG -D_DEBUG -O0 -ggdb -g3)
-set(CMAKE_CXX_FLAGS_DEBUG_INIT -DDEBUG -D_DEBUG -O0 -ggdb -g3)
+set(CMAKE_C_FLAGS_DEBUG_INIT -DDEBUG -D_DEBUG -O0 -ggdb -g3 -w -m32)
+set(CMAKE_CXX_FLAGS_DEBUG_INIT -DDEBUG -D_DEBUG -O0 -ggdb -g3 -w -m32)
 
-set(CMAKE_C_FLAGS_RELEASE_INIT -DNDEBUG -O3 -ggdb -g1)
-set(CMAKE_CXX_FLAGS_RELEASE_INIT -DNDEBUG -O3 -ggdb -g1)
+set(CMAKE_C_FLAGS_RELEASE_INIT -DNDEBUG -O3 -ggdb -g1 -w -m32)
+set(CMAKE_CXX_FLAGS_RELEASE_INIT -DNDEBUG -O3 -ggdb -g1 -w -m32)
 
-set(CMAKE_C_FLAGS "-w -m32")
-set(CMAKE_CXX_FLAGS "-w -m32")
+add_compile_options(-DDEBUG -D_DEBUG -O0 -ggdb -g3 -w -m32)
 
+find_package(Vulkan REQUIRED)
 
 add_subdirectory(TF2VulkanUtil)
-add_subdirectory(stdshader_vulkan)
+#add_subdirectory(stdshader_vulkan)
+add_subdirectory(shaderapivulkan)
diff --git a/TF2VulkanUtil/CMakeLists.txt b/TF2VulkanUtil/CMakeLists.txt
@@ -1,5 +1,4 @@
 project(tf2vulkanutil)
-set(CMAKE_CXX_STANDARD 20)
 
 add_library(tf2vulkanutil STATIC)
 

diff --git a/sdk2013 b/sdk2013
diff --git a/shaderapivulkan/CMakeLists.txt b/shaderapivulkan/CMakeLists.txt
@@ -0,0 +1,44 @@
+project(shaderapivulkan)
+set(CMAKE_CXX_STANDARD 20)
+
+add_library(shaderapivulkan STATIC)
+target_sources(shaderapivulkan PUBLIC
+        ../sdk2013/mp/src/public/tier0/memoverride.cpp
+        src/interface/internal/IShaderAPITexture.cpp
+        src/interface/internal/IVulkanCommandBuffer.cpp
+        include/TF2Vulkan/TextureData.cpp
+        src/stdafx.cpp
+        src/TF2Vulkan/BufferPool.cpp
+        src/TF2Vulkan/DebugTextureInfo.cpp
+        src/TF2Vulkan/Exceptions.cpp
+        src/TF2Vulkan/FormatConverter.cpp
+        src/TF2Vulkan/FormatInfo.cpp
+        src/TF2Vulkan/GraphicsPipeline.cpp
+        src/interface/internal/IVulkanQueue.cpp
+        src/TF2Vulkan/IShaderAPI/IShaderAPI_MeshManager.cpp
+        src/TF2Vulkan/IShaderAPI/IShaderAPI_TextureManager.cpp
+        src/TF2Vulkan/MaterialSystemHardwareConfig.cpp
+        src/TF2Vulkan/PixScope.cpp
+        src/TF2Vulkan/IShaderAPI/ShaderAPI.cpp
+        src/TF2Vulkan/RenderDocAPI.cpp
+        src/TF2Vulkan/ShaderDevice.cpp
+        src/TF2Vulkan/ShaderDeviceMgr.cpp
+        src/TF2Vulkan/ShaderNextFactory.cpp
+        src/TF2Vulkan/shaders/VulkanShaderManager.cpp
+        src/TF2Vulkan/StateManagerVulkan.cpp
+        src/TF2Vulkan/VBAllocTracker.cpp
+        src/TF2Vulkan/ResourceBlob.cpp
+        src/TF2Vulkan/VulkanFactories.cpp
+        src/TF2Vulkan/StateManagerStatic.cpp
+        src/TF2Vulkan/IShaderAPI/IShaderAPI_StateManagerDynamic.cpp
+        src/TF2Vulkan/VertexFormat.cpp
+        src/TF2Vulkan/vk_mem_alloc.cpp
+        src/TF2Vulkan/meshes/VulkanMesh.cpp
+        src/TF2Vulkan/VulkanUtil.cpp)
+
+target_include_directories(shaderapivulkan PUBLIC include
+        ./include/
+        ../TF2VulkanUtil/include/
+        ../stdshader_vulkan/include/
+        ../sdk2013/mp/src/public/)
+target_link_libraries(shaderapivulkan PRIVATE Vulkan::Vulkan)
diff --git a/shaderapivulkan/src/interface/internal/IShaderAPITexture.cpp b/shaderapivulkan/src/interface/internal/IShaderAPITexture.cpp
@@ -1,5 +1,8 @@
+#include <vulkan/vulkan.hpp>
+
+#include <TF2Vulkan/util/SafeConvert.h>
 #include "IShaderAPITexture.h"
-#include "TF2Vulkan/FormatInfo.h"
+#include "../../TF2Vulkan/FormatInfo.h"
 
 using namespace TF2Vulkan;
 

diff --git a/shaderapivulkan/src/interface/internal/IShaderAPITexture.h b/shaderapivulkan/src/interface/internal/IShaderAPITexture.h
@@ -3,6 +3,8 @@
 #include <materialsystem/itexture.h>
 #include <shaderapi/ishaderdynamic.h>
 
+#include <string_view>
+
 namespace TF2Vulkan
 {
 	// FIXME: Is it safe to assume nobody will try to cast this to ITextureInternal or something?

diff --git a/stdshader_vulkan/CMakeLists.txt b/stdshader_vulkan/CMakeLists.txt
@@ -10,3 +10,24 @@ add_custom_command( OUTPUT ${COMPILED_SHADERS}
                     WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/src/shaders/HLSL)
 add_custom_target(shaders DEPENDS ${COMPILED_SHADERS})
 
+
+add_library(stdshader_vulkan STATIC)
+target_sources(stdshader_vulkan PUBLIC
+        src/ShaderDLL.cpp
+        src/ShaderBlobs.cpp
+        src/ShaderDLL.cpp
+        src/ShaderDLLVerification.cpp
+        src/shaders/BaseShaderNext.cpp
+        src/shaders/BaseShader.cpp
+        src/shaders/LightmappedGeneric.cpp
+        src/shaders/PlaceholderShader.cpp
+        src/shaders/ShaderComponents/BaseShaderComponent.cpp
+        src/shaders/ShaderParamNext.cpp
+        src/shaders/XLitGeneric.cpp)
+set_source_files_properties(src/ShaderDLL.cpp PROPERTIES COMPILE_FLAGS "-std=c++2a")
+add_dependencies(stdshader_vulkan shaders)
+target_include_directories(stdshader_vulkan PUBLIC include
+                                ./include/
+                                ../TF2VulkanUtil/include/
+                                ../shaderapivulkan/include/
+                                ../sdk2013/mp/src/public/)
diff --git a/stdshader_vulkan/src/shaders/ShaderComponents/BaseShaderComponent.h b/stdshader_vulkan/src/shaders/ShaderComponents/BaseShaderComponent.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "shaders/ShaderParamNext.h"
+#include "../ShaderParamNext.h"
 
 #include "TF2Vulkan/ISpecConstLayout.h"
 #include "TF2Vulkan/ShaderResourceBinder.h"