Restore two makePrograms from previous commit

This commit is contained in:
Simon Walton 2018-04-20 17:52:40 -07:00
parent 999e5beba1
commit 4973605bf7

View file

@ -135,6 +135,7 @@ void DrawHighlightMask::run(const render::RenderContextPointer& renderContext, c
gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps); gpu::ShaderPointer program = gpu::Shader::createProgram(vs, ps);
gpu::Shader::BindingSet slotBindings; gpu::Shader::BindingSet slotBindings;
gpu::Shader::makeProgram(*program, slotBindings);
_stencilMaskPipeline = gpu::Pipeline::create(program, state); _stencilMaskPipeline = gpu::Pipeline::create(program, state);
_stencilMaskFillPipeline = gpu::Pipeline::create(program, fillState); _stencilMaskFillPipeline = gpu::Pipeline::create(program, fillState);
@ -326,6 +327,7 @@ const gpu::PipelinePointer& DrawHighlight::getPipeline(const render::HighlightSt
ps = Highlight_filled_frag::getShader(); ps = Highlight_filled_frag::getShader();
program = gpu::Shader::createProgram(vs, ps); program = gpu::Shader::createProgram(vs, ps);
gpu::Shader::makeProgram(*program, slotBindings);
_pipelineFilled = gpu::Pipeline::create(program, state); _pipelineFilled = gpu::Pipeline::create(program, state);
} }
return style.isFilled() ? _pipelineFilled : _pipeline; return style.isFilled() ? _pipelineFilled : _pipeline;