From 190c185d983609b0887c5d2d8f0e8af84d507ee7 Mon Sep 17 00:00:00 2001 From: Joshua Goins Date: Fri, 13 Oct 2023 14:58:46 -0400 Subject: [PATCH] Fix compilation errors --- src/dxbc/CMakeLists.txt | 3 ++- src/dxbc/dxbc_common.cpp | 4 ++-- src/dxbc/dxbc_compiler.cpp | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/dxbc/CMakeLists.txt b/src/dxbc/CMakeLists.txt index c83c25d..ff6d56b 100644 --- a/src/dxbc/CMakeLists.txt +++ b/src/dxbc/CMakeLists.txt @@ -32,4 +32,5 @@ target_sources(dxbc PRIVATE dxbc_util.h ) target_include_directories(dxbc PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(dxbc PUBLIC dxbc-util dxbc-spirv Vulkan::Vulkan) \ No newline at end of file +target_link_libraries(dxbc PUBLIC dxbc-util dxbc-spirv Vulkan::Vulkan) +target_compile_options(dxbc PRIVATE -fexceptions) \ No newline at end of file diff --git a/src/dxbc/dxbc_common.cpp b/src/dxbc/dxbc_common.cpp index d150c58..fa50d2c 100644 --- a/src/dxbc/dxbc_common.cpp +++ b/src/dxbc/dxbc_common.cpp @@ -11,7 +11,7 @@ namespace dxvk { case DxbcProgramType::DomainShader : return VK_SHADER_STAGE_TESSELLATION_EVALUATION_BIT; case DxbcProgramType::ComputeShader : return VK_SHADER_STAGE_COMPUTE_BIT; } - + throw DxvkError("DxbcProgramInfo::shaderStage: Unsupported program type"); } @@ -25,7 +25,7 @@ namespace dxvk { case DxbcProgramType::DomainShader : return spv::ExecutionModelTessellationEvaluation; case DxbcProgramType::ComputeShader : return spv::ExecutionModelGLCompute; } - + throw DxvkError("DxbcProgramInfo::executionModel: Unsupported program type"); } diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp index 154a0ce..0d9d918 100644 --- a/src/dxbc/dxbc_compiler.cpp +++ b/src/dxbc/dxbc_compiler.cpp @@ -1466,6 +1466,8 @@ namespace dxvk { m_bindings.push_back(binding); return varId;*/ + + return 0; }