Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 61 files). Show all
Unified · Split
| @@ -18,14 +18,12 @@ · 17 unmodified lines | ||
| 18 | 18 | #include <gpu/Context.h> |
| 19 | 19 | #include <render/Scene.h> |
| 20 | 20 | #include <ViewFrustum.h> |
| 21 | +#include <shaders/Shaders.h> | |
| 21 | 22 | |
| 22 | 23 | #include "GeometryCache.h" |
| 23 | 24 | #include "TextureCache.h" |
| 24 | 25 | #include "DeferredLightingEffect.h" |
| 25 | 26 | |
| 26 | −#include "debug_deferred_buffer_vert.h" | |
| 27 | −#include "debug_deferred_buffer_frag.h" | |
| 28 | − | |
| 29 | 27 | using namespace render; |
| 30 | 28 | |
| 31 | 29 | void DebugDeferredBufferConfig::setMode(int newMode) { |
| @@ -378,7 +376,7 @@ bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, std::string customFile) · 346 unmodified lines | ||
| 378 | 376 | |
| 379 | 377 | const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) { |
| 380 | 378 | if (pipelineNeedsUpdate(mode, customFile)) { |
| 381 | − static const std::string FRAGMENT_SHADER { debug_deferred_buffer_frag::getSource() }; | |
| 379 | + static const std::string FRAGMENT_SHADER { gpu::Shader::getFragmentShaderSource(shader::render_utils::fragment::debug_deferred_buffer).getCode() }; | |
| 382 | 380 | static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" }; |
| 383 | 381 | static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER); |
| 384 | 382 | Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO, |
| @@ -388,7 +386,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str · 3 unmodified lines | ||
| 388 | 386 | bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(), |
| 389 | 387 | getShaderSourceCode(mode, customFile)); |
| 390 | 388 | |
| 391 | − const auto vs = debug_deferred_buffer_vert::getShader(); | |
| 389 | + const auto vs = gpu::Shader::createVertex(shader::render_utils::vertex::debug_deferred_buffer); | |
| 392 | 390 | const auto ps = gpu::Shader::createPixel(bakedFragmentShader); |
| 393 | 391 | const auto program = gpu::Shader::createProgram(vs, ps); |
| 394 | 392 | |