History

Merged with master

Olivier Prat committed 8 years ago

Commit f5a25572 parents 92e1fe8 0ef27941213 files · +53263 −55587Browse files

Showing the changes to libraries/render/src/render/DrawStatus.cpp (1 of 1213 files). Show all

Unified · Split

libraries/render/src/render/DrawStatus.cpp+4−4
@@ -35,8 +35,8 @@ void DrawStatusConfig::dirtyHelper() { · 34 unmodified lines
3535
3636 const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() {
3737 if (!_drawItemBoundsPipeline) {
38− auto vs = gpu::Shader::createVertex(std::string(drawItemBounds_vert));
39− auto ps = gpu::Shader::createPixel(std::string(drawItemBounds_frag));
38+ auto vs = drawItemBounds_vert::getShader();
39+ auto ps = drawItemBounds_frag::getShader();
4040 gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
4141
4242 gpu::Shader::BindingSet slotBindings;
@@ -63,8 +63,8 @@ const gpu::PipelinePointer DrawStatus::getDrawItemBoundsPipeline() { · 20 unmodified lines
6363
6464 const gpu::PipelinePointer DrawStatus::getDrawItemStatusPipeline() {
6565 if (!_drawItemStatusPipeline) {
66− auto vs = gpu::Shader::createVertex(std::string(drawItemStatus_vert));
67− auto ps = gpu::Shader::createPixel(std::string(drawItemStatus_frag));
66+ auto vs = drawItemStatus_vert::getShader();
67+ auto ps = drawItemStatus_frag::getShader();
6868 gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
6969
7070 gpu::Shader::BindingSet slotBindings;

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