History

Moving to cmake time shader compiling

Brad Davis committed 8 years ago

Commit 04e84f11 parent d6bcdcd61 files · +878 −1106Browse files

Showing the changes to libraries/render-utils/src/DebugDeferredBuffer.cpp (1 of 61 files). Show all

Unified · Split

libraries/render-utils/src/DebugDeferredBuffer.cpp+3−5
@@ -18,14 +18,12 @@ · 17 unmodified lines
18#include <gpu/Context.h>18#include <gpu/Context.h>
19#include <render/Scene.h>19#include <render/Scene.h>
20#include <ViewFrustum.h>20#include <ViewFrustum.h>
21#include <shaders/Shaders.h>
21 22
22#include "GeometryCache.h"23#include "GeometryCache.h"
23#include "TextureCache.h"24#include "TextureCache.h"
24#include "DeferredLightingEffect.h"25#include "DeferredLightingEffect.h"
25 26
26#include "debug_deferred_buffer_vert.h"
27#include "debug_deferred_buffer_frag.h"
28
29using namespace render;27using namespace render;
30 28
31void DebugDeferredBufferConfig::setMode(int newMode) {29void DebugDeferredBufferConfig::setMode(int newMode) {
@@ -378,7 +376,7 @@ bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, std::string customFile) · 346 unmodified lines
378 376
379const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) {377const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) {
380 if (pipelineNeedsUpdate(mode, customFile)) {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 static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" };380 static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" };
383 static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);381 static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);
384 Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,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 bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(),386 bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(),
389 getShaderSourceCode(mode, customFile));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 const auto ps = gpu::Shader::createPixel(bakedFragmentShader);390 const auto ps = gpu::Shader::createPixel(bakedFragmentShader);
393 const auto program = gpu::Shader::createProgram(vs, ps);391 const auto program = gpu::Shader::createProgram(vs, ps);
394 392

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t