From df0ef18ba85171ebb3751d5f0b0fdd640f3b2801 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Wed, 22 Mar 2023 21:46:17 +0100
Subject: [PATCH] Update hlsl shader compiler and remove debug logging
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
modules/shader_compiler/src/vkcv/shader/HLSLCompiler.cpp | 4 ++--
src/vkcv/GraphicsPipelineManager.cpp | 9 ---------
2 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/modules/shader_compiler/src/vkcv/shader/HLSLCompiler.cpp b/modules/shader_compiler/src/vkcv/shader/HLSLCompiler.cpp
index 629f941c..0d3991d1 100644
--- a/modules/shader_compiler/src/vkcv/shader/HLSLCompiler.cpp
+++ b/modules/shader_compiler/src/vkcv/shader/HLSLCompiler.cpp
@@ -28,9 +28,9 @@ namespace vkcv::shader {
case ShaderStage::COMPUTE:
return EShLangCompute;
case ShaderStage::TASK:
- return EShLangTaskNV;
+ return EShLangTask;
case ShaderStage::MESH:
- return EShLangMeshNV;
+ return EShLangMesh;
case ShaderStage::RAY_GEN:
return EShLangRayGen;
case ShaderStage::RAY_CLOSEST_HIT:
diff --git a/src/vkcv/GraphicsPipelineManager.cpp b/src/vkcv/GraphicsPipelineManager.cpp
index 767616f7..4f8a217d 100644
--- a/src/vkcv/GraphicsPipelineManager.cpp
+++ b/src/vkcv/GraphicsPipelineManager.cpp
@@ -706,15 +706,6 @@ namespace vkcv {
0
);
- vkcv_log(LogLevel::RAW_INFO, "STAGES: %lu", shaderStages.size());
- for (const auto& shaderStage : shaderStages) {
- vkcv_log(LogLevel::RAW_INFO, "STAGE: %s %s %s",
- shaderStage.pName,
- vk::to_string(shaderStage.stage).c_str(),
- vk::to_string(shaderStage.flags).c_str()
- );
- }
-
auto pipelineResult = getCore().getContext().getDevice().createGraphicsPipeline(
nullptr, graphicsPipelineCreateInfo
);
--
GitLab