git/SDL3CPlusPlus
1
0
Fork 0
mirror of https://github.com/johndoe6345789/SDL3CPlusPlus.git synced 2026-04-24 13:44:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Inline IsSpirvPath checks to simplify shader path validation

Browse Source
This commit is contained in:
johndoe6345789
2026-01-05 22:40:36 +00:00
parent 3299388857
commit fa009b11a9
2 changed files with 5 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/services/impl/gui_renderer.cpp
View File

@@ -228,10 +228,6 @@ std::vector<ClipPoint> ClipPolygonToRect(const std::vector<ClipPoint>& polygon,
return output;
}
bool IsSpirvPath(const std::filesystem::path& path) {
return path.extension() == ".spv";
}
shaderc_shader_kind ShadercKindFromStage(VkShaderStageFlagBits stage) {
switch (stage) {
case VK_SHADER_STAGE_VERTEX_BIT:
@@ -277,7 +273,7 @@ std::vector<uint8_t> ReadShaderFile(const std::filesystem::path& path,
}
std::filesystem::path shaderPath = path;
if (!std::filesystem::exists(shaderPath) && IsSpirvPath(shaderPath)) {
if (!std::filesystem::exists(shaderPath) && shaderPath.extension() == ".spv") {
std::filesystem::path sourcePath = shaderPath;
sourcePath.replace_extension();
if (std::filesystem::exists(sourcePath)) {
@@ -298,7 +294,7 @@ std::vector<uint8_t> ReadShaderFile(const std::filesystem::path& path,
throw std::runtime_error("Path is not a regular file: " + shaderPath.string());
}
if (IsSpirvPath(shaderPath)) {
if (shaderPath.extension() == ".spv") {
auto buffer = ReadBinaryFile(shaderPath);
if (logger) {
logger->Trace("GuiRenderer", "ReadShaderFile",

10
src/services/impl/pipeline_service.cpp
View File

@@ -10,10 +10,6 @@
#include <vector>
namespace {
bool IsSpirvPath(const std::filesystem::path& path) {
return path.extension() == ".spv";
}
shaderc_shader_kind ShadercKindFromStage(VkShaderStageFlagBits stage) {
switch (stage) {
case VK_SHADER_STAGE_VERTEX_BIT:
@@ -400,7 +396,7 @@ bool PipelineService::HasShaderSource(const std::string& path) const {
if (std::filesystem::exists(shaderPath)) {
return true;
}
if (IsSpirvPath(shaderPath)) {
if (shaderPath.extension() == ".spv") {
std::filesystem::path sourcePath = shaderPath;
sourcePath.replace_extension();
return std::filesystem::exists(sourcePath);
@@ -417,7 +413,7 @@ const std::vector<char>& PipelineService::ReadShaderFile(const std::string& path
}
std::filesystem::path shaderPath(path);
if (!std::filesystem::exists(shaderPath) && IsSpirvPath(shaderPath)) {
if (!std::filesystem::exists(shaderPath) && shaderPath.extension() == ".spv") {
std::filesystem::path sourcePath = shaderPath;
sourcePath.replace_extension();
if (std::filesystem::exists(sourcePath)) {
@@ -446,7 +442,7 @@ const std::vector<char>& PipelineService::ReadShaderFile(const std::string& path
}
std::vector<char> buffer;
if (IsSpirvPath(shaderPath)) {
if (shaderPath.extension() == ".spv") {
std::ifstream file(shaderPath, std::ios::ate | std::ios::binary);
if (!file) {
throw std::runtime_error("Failed to open shader file: " + shaderPath.string() +