Catcrafts/Crafter.Build
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

comment shader

Browse source
This commit is contained in:
Jorijn van der Graaf 2025-04-24 19:25:13 +02:00
commit d13bf354ab
2 changed files with 55 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

108
Crafter.Build-Shader.cpp
View file

@ -35,65 +35,65 @@ Shader::Shader(fs::path path, std::string entrypoint, EShLanguage type): path(pa
} }
void Shader::Compile(fs::path outputDir) { void Shader::Compile(fs::path outputDir) {
glslang::InitializeProcess(); // glslang::InitializeProcess();
EShMessages messages = static_cast<EShMessages>(EShMsgDefault | EShMsgVulkanRules | EShMsgSpvRules); // EShMessages messages = static_cast<EShMessages>(EShMsgDefault | EShMsgVulkanRules | EShMsgSpvRules);
std::ifstream fileStream(path, std::ios::in | std::ios::binary); // std::ifstream fileStream(path, std::ios::in | std::ios::binary);
if (!fileStream) { // if (!fileStream) {
throw std::ios_base::failure("Failed to open file: " + path.string()); // throw std::ios_base::failure("Failed to open file: " + path.string());
} // }
std::ostringstream contents; // std::ostringstream contents;
contents << fileStream.rdbuf(); // contents << fileStream.rdbuf();
std::string src = contents.str(); // std::string src = contents.str();
const char *file_name_list[1] = {""}; // const char *file_name_list[1] = {""};
const char *shader_source = reinterpret_cast<const char *>(src.data()); // const char *shader_source = reinterpret_cast<const char *>(src.data());
glslang::TShader shader(type); // glslang::TShader shader(type);
shader.setStringsWithLengthsAndNames(&shader_source, nullptr, file_name_list, 1); // shader.setStringsWithLengthsAndNames(&shader_source, nullptr, file_name_list, 1);
shader.setEntryPoint(entrypoint.c_str()); // shader.setEntryPoint(entrypoint.c_str());
shader.setSourceEntryPoint(entrypoint.c_str()); // shader.setSourceEntryPoint(entrypoint.c_str());
shader.setEnvTarget(glslang::EShTargetSpv, glslang::EShTargetSpv_1_4); // shader.setEnvTarget(glslang::EShTargetSpv, glslang::EShTargetSpv_1_4);
DirStackFileIncluder includeDir; // DirStackFileIncluder includeDir;
includeDir.pushExternalLocalDirectory(path.parent_path().generic_string()); // includeDir.pushExternalLocalDirectory(path.parent_path().generic_string());
std::string info_log; // std::string info_log;
if (!shader.parse(GetDefaultResources(), 100, false, messages, includeDir)) // if (!shader.parse(GetDefaultResources(), 100, false, messages, includeDir))
{ // {
info_log = std::string(shader.getInfoLog()) + std::string(shader.getInfoDebugLog()); // info_log = std::string(shader.getInfoLog()) + std::string(shader.getInfoDebugLog());
} // }
// Add shader to new program object. // // Add shader to new program object.
glslang::TProgram program; // glslang::TProgram program;
program.addShader(&shader); // program.addShader(&shader);
// Link program. // // Link program.
if (!program.link(messages)) // if (!program.link(messages))
{ // {
info_log = std::string(program.getInfoLog()) + std::string(program.getInfoDebugLog()); // info_log = std::string(program.getInfoLog()) + std::string(program.getInfoDebugLog());
} // }
// Save any info log that was generated. // // Save any info log that was generated.
if (shader.getInfoLog()) // if (shader.getInfoLog())
{ // {
info_log += std::string(shader.getInfoLog()) + std::string(shader.getInfoDebugLog()); // info_log += std::string(shader.getInfoLog()) + std::string(shader.getInfoDebugLog());
} // }
if (program.getInfoLog()) // if (program.getInfoLog())
{ // {
info_log += std::string(program.getInfoLog()) + std::string(program.getInfoDebugLog()); // info_log += std::string(program.getInfoLog()) + std::string(program.getInfoDebugLog());
} // }
glslang::TIntermediate* intermediate = program.getIntermediate(type); // glslang::TIntermediate* intermediate = program.getIntermediate(type);
if (!intermediate) // if (!intermediate)
{ // {
info_log += "Failed to get shared intermediate code."; // info_log += "Failed to get shared intermediate code.";
} // }
spv::SpvBuildLogger logger; // spv::SpvBuildLogger logger;
std::vector<std::uint32_t> spirv; // std::vector<std::uint32_t> spirv;
std::cout << info_log; // std::cout << info_log;
glslang::GlslangToSpv(*intermediate, spirv, &logger); // glslang::GlslangToSpv(*intermediate, spirv, &logger);
std::cout << logger.getAllMessages(); // std::cout << logger.getAllMessages();
glslang::FinalizeProcess(); // glslang::FinalizeProcess();
path.replace_extension("spirv"); // path.replace_extension("spirv");
std::ofstream file(outputDir/path, std::ios::binary); // std::ofstream file(outputDir/path, std::ios::binary);
file.write(reinterpret_cast<const char*>(spirv.data()), spirv.size() * sizeof(std::uint32_t)); // file.write(reinterpret_cast<const char*>(spirv.data()), spirv.size() * sizeof(std::uint32_t));
} }

2
build.sh
View file

@ -1,11 +1,11 @@
mkdir build mkdir build
mkdir bin mkdir bin
clang++ -std=c++26 Crafter.Build-Shader.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Shader.pcm
clang++ -std=c++26 Crafter.Build-Dependency.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Dependency.pcm clang++ -std=c++26 Crafter.Build-Dependency.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Dependency.pcm
clang++ -std=c++26 Crafter.Build-Configuration.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Configuration.pcm clang++ -std=c++26 Crafter.Build-Configuration.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Configuration.pcm
clang++ -std=c++26 Crafter.Build-ModuleFile.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-ModuleFile.pcm clang++ -std=c++26 Crafter.Build-ModuleFile.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-ModuleFile.pcm
clang++ -std=c++26 Crafter.Build-Project.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Project.pcm clang++ -std=c++26 Crafter.Build-Project.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Project.pcm
clang++ -std=c++26 Crafter.Build-Shader.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build-Shader.pcm
clang++ -std=c++26 Crafter.Build.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build.pcm clang++ -std=c++26 Crafter.Build.cppm --precompile -fprebuilt-module-path=./build -o ./build/Crafter.Build.pcm
clang++ -std=c++26 Crafter.Build-Dependency.cpp -fprebuilt-module-path=./build -c -O3 -o ./build/Crafter.Build-Dependency_source.o clang++ -std=c++26 Crafter.Build-Dependency.cpp -fprebuilt-module-path=./build -c -O3 -o ./build/Crafter.Build-Dependency_source.o