History

Fixed compilation with new shader system

Olivier Prat committed 8 years ago

Commit 49549ce1 parent 3911ce531 files · +292 −300Browse files

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

Unified · Split

libraries/render-utils/src/DebugDeferredBuffer.cpp+2−3
@@ -369,8 +369,7 @@ bool DebugDeferredBuffer::pipelineNeedsUpdate(Mode mode, std::string customFile) · 368 unmodified lines
369 369
370const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) {370const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::string customFile) {
371 if (pipelineNeedsUpdate(mode, customFile)) {371 if (pipelineNeedsUpdate(mode, customFile)) {
372 static const std::string VERTEX_SHADER { debug_deferred_buffer_vert };372 static const std::string FRAGMENT_SHADER { debug_deferred_buffer_frag::getSource() };
373 static const std::string FRAGMENT_SHADER { debug_deferred_buffer_frag };
374 static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" };373 static const std::string SOURCE_PLACEHOLDER { "//SOURCE_PLACEHOLDER" };
375 static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);374 static const auto SOURCE_PLACEHOLDER_INDEX = FRAGMENT_SHADER.find(SOURCE_PLACEHOLDER);
376 Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,375 Q_ASSERT_X(SOURCE_PLACEHOLDER_INDEX != std::string::npos, Q_FUNC_INFO,
@@ -380,7 +379,7 @@ const gpu::PipelinePointer& DebugDeferredBuffer::getPipeline(Mode mode, std::str · 3 unmodified lines
380 bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(),379 bakedFragmentShader.replace(SOURCE_PLACEHOLDER_INDEX, SOURCE_PLACEHOLDER.size(),
381 getShaderSourceCode(mode, customFile));380 getShaderSourceCode(mode, customFile));
382 381
383 static const auto vs = gpu::Shader::createVertex(VERTEX_SHADER);382 const auto vs = debug_deferred_buffer_vert::getShader();
384 const auto ps = gpu::Shader::createPixel(bakedFragmentShader);383 const auto ps = gpu::Shader::createPixel(bakedFragmentShader);
385 const auto program = gpu::Shader::createProgram(vs, ps);384 const auto program = gpu::Shader::createProgram(vs, ps);
386 385

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