From 96ca9fa6ea2ad572a1c11391ff29e0e4b720eaa4 Mon Sep 17 00:00:00 2001 From: Philip Rebohle Date: Mon, 5 Mar 2018 15:02:17 +0100 Subject: [PATCH] [dxbc] Fixed tessellation factor enums --- src/dxbc/dxbc_compiler.cpp | 2 +- src/dxbc/dxbc_enums.h | 50 +++++++++++++++++++++----------------- src/dxbc/dxbc_names.cpp | 12 ++++++--- 3 files changed, 38 insertions(+), 26 deletions(-) diff --git a/src/dxbc/dxbc_compiler.cpp b/src/dxbc/dxbc_compiler.cpp index 0540b9a9..98bd425a 100644 --- a/src/dxbc/dxbc_compiler.cpp +++ b/src/dxbc/dxbc_compiler.cpp @@ -5265,7 +5265,7 @@ namespace dxvk { m_entryPointInterfaces.push_back(varId); return varId; } - + uint32_t DxbcCompiler::emitBuiltinTessLevelOuter(spv::StorageClass storageClass) { uint32_t id = emitNewBuiltinVariable( diff --git a/src/dxbc/dxbc_enums.h b/src/dxbc/dxbc_enums.h index 1369eb14..5a2919b5 100644 --- a/src/dxbc/dxbc_enums.h +++ b/src/dxbc/dxbc_enums.h @@ -390,28 +390,34 @@ namespace dxvk { enum class DxbcSystemValue : uint32_t { - None = 0, - Position = 1, - ClipDistance = 2, - CullDistance = 3, - RenderTargetId = 4, - ViewportId = 5, - VertexId = 6, - PrimitiveId = 7, - InstanceId = 8, - IsFrontFace = 9, - SampleIndex = 10, - FinalQuadEdgeTessFactor = 11, - FinalQuadInsideTessFactor = 12, - FinalTriEdgeTessFactor = 13, - FinalTriInsideTessFactor = 14, - FinalLineDetailTessFactor = 15, - FinalLineDensityTessFactor = 16, - Target = 64, - Depth = 65, - Coverage = 66, - DepthGe = 67, - DepthLe = 68 + None = 0, + Position = 1, + ClipDistance = 2, + CullDistance = 3, + RenderTargetId = 4, + ViewportId = 5, + VertexId = 6, + PrimitiveId = 7, + InstanceId = 8, + IsFrontFace = 9, + SampleIndex = 10, + FinalQuadUeq0EdgeTessFactor = 11, + FinalQuadVeq0EdgeTessFactor = 12, + FinalQuadUeq1EdgeTessFactor = 13, + FinalQuadVeq1EdgeTessFactor = 14, + FinalQuadUInsideTessFactor = 15, + FinalQuadVInsideTessFactor = 16, + FinalTriUeq0EdgeTessFactor = 17, + FinalTriVeq0EdgeTessFactor = 18, + FinalTriWeq0EdgeTessFactor = 19, + FinalTriInsideTessFactor = 20, + FinalLineDetailTessFactor = 21, + FinalLineDensityTessFactor = 22, + Target = 64, + Depth = 65, + Coverage = 66, + DepthGe = 67, + DepthLe = 68 }; diff --git a/src/dxbc/dxbc_names.cpp b/src/dxbc/dxbc_names.cpp index d8509b3a..059efb17 100644 --- a/src/dxbc/dxbc_names.cpp +++ b/src/dxbc/dxbc_names.cpp @@ -384,9 +384,15 @@ std::ostream& operator << (std::ostream& os, DxbcSystemValue e) { ENUM_NAME(DxbcSystemValue::InstanceId); ENUM_NAME(DxbcSystemValue::IsFrontFace); ENUM_NAME(DxbcSystemValue::SampleIndex); - ENUM_NAME(DxbcSystemValue::FinalQuadEdgeTessFactor); - ENUM_NAME(DxbcSystemValue::FinalQuadInsideTessFactor); - ENUM_NAME(DxbcSystemValue::FinalTriEdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadUeq0EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadVeq0EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadUeq1EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadVeq1EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadUInsideTessFactor); + ENUM_NAME(DxbcSystemValue::FinalQuadVInsideTessFactor); + ENUM_NAME(DxbcSystemValue::FinalTriUeq0EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalTriVeq0EdgeTessFactor); + ENUM_NAME(DxbcSystemValue::FinalTriWeq0EdgeTessFactor); ENUM_NAME(DxbcSystemValue::FinalTriInsideTessFactor); ENUM_NAME(DxbcSystemValue::FinalLineDetailTessFactor); ENUM_NAME(DxbcSystemValue::FinalLineDensityTessFactor);