Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 09:29:53 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'temp1' of https://github.com/samcake/hifi into orange

Browse source
This commit is contained in:
Sam Gateau 2015-04-07 11:45:57 -07:00
commit 9d6839e6a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
libraries/render-utils/src/Model.cpp
View file

@ -113,7 +113,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
bool makeResult = gpu::Shader::makeProgram(*program, slotBindings); bool makeResult = gpu::Shader::makeProgram(*program, slotBindings);
Locations* locations = new Locations(); auto locations = std::shared_ptr<Locations>(new Locations());
initLocations(program, *locations); initLocations(program, *locations);
@ -138,7 +138,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
// Good to go add the brand new pipeline // Good to go add the brand new pipeline
auto pipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, state)); auto pipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, state));
auto it = insert(value_type(key.getRaw(), RenderPipeline(pipeline, std::shared_ptr<Locations>(locations)))); auto it = insert(value_type(key.getRaw(), RenderPipeline(pipeline, locations)));
// If not a shadow pass, create the mirror version from the same state, just change the FrontFace // If not a shadow pass, create the mirror version from the same state, just change the FrontFace
if (!key.isShadow()) { if (!key.isShadow()) {
@ -150,7 +150,7 @@ void Model::RenderPipelineLib::addRenderPipeline(Model::RenderKey key,
// create a new RenderPipeline with the same shader side and the mirrorState // create a new RenderPipeline with the same shader side and the mirrorState
auto mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, mirrorState)); auto mirrorPipeline = gpu::PipelinePointer(gpu::Pipeline::create(program, mirrorState));
auto it = insert(value_type(mirrorKey.getRaw(), RenderPipeline(mirrorPipeline, std::shared_ptr<Locations>(locations)))); auto it = insert(value_type(mirrorKey.getRaw(), RenderPipeline(mirrorPipeline, locations)));
} }
} }