diff options
| -rw-r--r-- | samples/amber.cc | 8 | ||||
| -rw-r--r-- | src/amber.cc | 2 | ||||
| -rw-r--r-- | src/pipeline.cc | 14 | ||||
| -rw-r--r-- | src/pipeline.h | 2 | ||||
| -rw-r--r-- | src/vkscript/parser.cc | 2 |
5 files changed, 16 insertions, 12 deletions
diff --git a/samples/amber.cc b/samples/amber.cc index 3b9e263..542a2e0 100644 --- a/samples/amber.cc +++ b/samples/amber.cc @@ -32,6 +32,8 @@ namespace { +const char* kGeneratedColorBuffer = "framebuffer"; + struct Options { std::vector<std::string> input_filenames; @@ -376,7 +378,7 @@ int main(int argc, const char** argv) { if (!options.image_filename.empty()) { amber::BufferInfo buffer_info; - buffer_info.buffer_name = "framebuffer"; + buffer_info.buffer_name = kGeneratedColorBuffer; amber_options.extractions.push_back(buffer_info); } @@ -400,7 +402,7 @@ int main(int argc, const char** argv) { bool usePNG = pos != std::string::npos && options.image_filename.substr(pos + 1) == "png"; for (const amber::BufferInfo& buffer_info : amber_options.extractions) { - if (buffer_info.buffer_name == "framebuffer") { + if (buffer_info.buffer_name == kGeneratedColorBuffer) { if (usePNG) { result = png::ConvertToPNG(buffer_info.width, buffer_info.height, buffer_info.values, &out_buf); @@ -436,7 +438,7 @@ int main(int argc, const char** argv) { std::cerr << options.buffer_filename << std::endl; } else { for (const amber::BufferInfo& buffer_info : amber_options.extractions) { - if (buffer_info.buffer_name == "framebuffer") + if (buffer_info.buffer_name == kGeneratedColorBuffer) continue; buffer_file << buffer_info.buffer_name << std::endl; diff --git a/src/amber.cc b/src/amber.cc index 2b9e496..f37e875 100644 --- a/src/amber.cc +++ b/src/amber.cc @@ -189,7 +189,7 @@ amber::Result Amber::ExecuteWithShaderData(const amber::Recipe* recipe, // extractor fails before running the pipeline that will trigger the dumps // to almost always fail. for (BufferInfo& buffer_info : opts->extractions) { - if (buffer_info.buffer_name == "framebuffer") { + if (buffer_info.buffer_name == Pipeline::kGeneratedColorBuffer) { auto* buffer = script->GetBuffer(buffer_info.buffer_name); if (!buffer) break; diff --git a/src/pipeline.cc b/src/pipeline.cc index b7e2780..a759aeb 100644 --- a/src/pipeline.cc +++ b/src/pipeline.cc @@ -21,6 +21,15 @@ #include "src/make_unique.h" namespace amber { +namespace { + +const char* kDefaultColorBufferFormat = "B8G8R8A8_UNORM"; +const char* kDefaultDepthBufferFormat = "D32_SFLOAT_S8_UINT"; + +} // namespace + +const char* Pipeline::kGeneratedColorBuffer = "framebuffer"; +const char* Pipeline::kGeneratedDepthBuffer = "depth_buffer"; Pipeline::ShaderInfo::ShaderInfo(const Shader* shader, ShaderType type) : shader_(shader), shader_type_(type), entry_point_("main") {} @@ -29,11 +38,6 @@ Pipeline::ShaderInfo::ShaderInfo(const ShaderInfo&) = default; Pipeline::ShaderInfo::~ShaderInfo() = default; -const char* Pipeline::kDefaultColorBufferFormat = "B8G8R8A8_UNORM"; -const char* Pipeline::kDefaultDepthBufferFormat = "D32_SFLOAT_S8_UINT"; -const char* Pipeline::kGeneratedColorBuffer = "framebuffer"; -const char* Pipeline::kGeneratedDepthBuffer = "depth_buffer"; - Pipeline::Pipeline(PipelineType type) : pipeline_type_(type) {} Pipeline::~Pipeline() = default; diff --git a/src/pipeline.h b/src/pipeline.h index 903c2c3..56bbd2a 100644 --- a/src/pipeline.h +++ b/src/pipeline.h @@ -72,8 +72,6 @@ class Pipeline { uint32_t location = 0; }; - static const char* kDefaultColorBufferFormat; - static const char* kDefaultDepthBufferFormat; static const char* kGeneratedColorBuffer; static const char* kGeneratedDepthBuffer; diff --git a/src/vkscript/parser.cc b/src/vkscript/parser.cc index 79875c7..b2f0af2 100644 --- a/src/vkscript/parser.cc +++ b/src/vkscript/parser.cc @@ -201,7 +201,7 @@ Result Parser::ProcessRequireBlock(const SectionParser::Section& section) { std::string str = token->AsString(); if (IsKnownFeature(str)) { script_->AddRequiredFeature(str); - } else if (str == "framebuffer") { + } else if (str == Pipeline::kGeneratedColorBuffer) { token = tokenizer.NextToken(); if (!token->IsString()) return Result(make_error(tokenizer, "Missing framebuffer format")); |