From d039184f91f23380f1fb28ff4a13c97c2add3785 Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Sun, 12 Sep 2021 07:19:28 +0100 Subject: [PATCH 1/3] Updated makefile for compatibility in windows Signed-off-by: Alejandro Saucedo --- Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index a7aaa345c..b6ff3ea58 100644 --- a/Makefile +++ b/Makefile @@ -118,10 +118,11 @@ vs_cmake: -DKOMPUTE_OPT_INSTALL=1 \ -DKOMPUTE_OPT_REPO_SUBMODULE_BUILD=0 \ -DKOMPUTE_OPT_BUILD_TESTS=1 \ - -DKOMPUTE_OPT_BUILD_DOCS=1 \ -DKOMPUTE_OPT_BUILD_SHADERS=1 \ -DKOMPUTE_OPT_BUILD_SINGLE_HEADER=1 \ -DKOMPUTE_OPT_ENABLE_SPDLOG=1 \ + -DKOMPUTE_OPT_CODE_COVERAGE=0 \ + -DKOMPUTE_OPT_BUILD_DOCS=0 \ -G "Visual Studio 16 2019" vs_build_all: From 9de01010955b9b7c26c5664d2f73f8e78e7aad1e Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Sun, 12 Sep 2021 07:19:42 +0100 Subject: [PATCH 2/3] Updated shader helper to work in windows and linux Signed-off-by: Alejandro Saucedo --- test/utils/kompute_test/Shader.hpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/test/utils/kompute_test/Shader.hpp b/test/utils/kompute_test/Shader.hpp index ef20e9eaa..03789130e 100644 --- a/test/utils/kompute_test/Shader.hpp +++ b/test/utils/kompute_test/Shader.hpp @@ -20,7 +20,10 @@ std::vector compileSource( const std::string& source) { - if (system(std::string("glslangValidator --stdin -S comp -V -o tmp_kp_shader.comp.spv << END\n" + source + "\nEND").c_str())) + std::ofstream fileOut("tmp_kp_shader.comp"); + fileOut << source; + fileOut.close(); + if (system(std::string("glslangValidator -V tmp_kp_shader.comp -o tmp_kp_shader.comp.spv").c_str())) throw std::runtime_error("Error running glslangValidator command"); std::ifstream fileStream("tmp_kp_shader.comp.spv", std::ios::binary); std::vector buffer; From 8618599c91a95215221b67fb7725e657e682c40c Mon Sep 17 00:00:00 2001 From: Alejandro Saucedo Date: Sun, 12 Sep 2021 07:19:53 +0100 Subject: [PATCH 3/3] Added new tmp created file to gitignore Signed-off-by: Alejandro Saucedo --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index f72d9ff7e..e3e5c4a62 100644 --- a/.gitignore +++ b/.gitignore @@ -187,4 +187,5 @@ release/ swiftshader/ vk_swiftshader_icd.json tmp_kp_shader.comp.spv +tmp_kp_shader.comp