From cd1369178313266f8622e767707404d80e929561 Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Fri, 30 Jun 2017 10:20:31 -0400 Subject: [PATCH] Update SPRIV-Cross for HLSL SM5.1 register name support --- src/backend/d3d12/ShaderModuleD3D12.cpp | 12 ------------ third_party/spirv-cross | 2 +- 2 files changed, 1 insertion(+), 13 deletions(-) diff --git a/src/backend/d3d12/ShaderModuleD3D12.cpp b/src/backend/d3d12/ShaderModuleD3D12.cpp index 87a272ec95..ee52a288d0 100644 --- a/src/backend/d3d12/ShaderModuleD3D12.cpp +++ b/src/backend/d3d12/ShaderModuleD3D12.cpp @@ -59,18 +59,6 @@ namespace d3d12 { RenumberBindings(resources.separate_samplers); // s hlslSource = compiler.compile(); - - { - // pending https://github.com/KhronosGroup/SPIRV-Cross/issues/216 - // rename ": register(cN)" to ": register(bN)" - std::string::size_type pos = 0; - const std::string search = ": register(c"; - const std::string replace = ": register(b"; - while ((pos = hlslSource.find(search, pos)) != std::string::npos) { - hlslSource.replace(pos, search.length(), replace); - pos += replace.length(); - } - } } const std::string& ShaderModule::GetHLSLSource() const { diff --git a/third_party/spirv-cross b/third_party/spirv-cross index a2f6679d13..2cbeaac76f 160000 --- a/third_party/spirv-cross +++ b/third_party/spirv-cross @@ -1 +1 @@ -Subproject commit a2f6679d13afd76093c3dd2dd81c63dff16779c4 +Subproject commit 2cbeaac76f6fac04f077a6aea2bd1417909798f3