History

Merge branch 'master' of https://github.com/highfidelity/hifi into graphicsMaster

samcake committed 10 years ago

Commit d8a71db2 parents aac59ad 40272fa40 files · +584 −408Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+2−2
@@ -128,8 +128,8 @@ void DeferredLightingEffect::init() { · 127 unmodified lines
128 128
129 129
130gpu::PipelinePointer DeferredLightingEffect::bindSimpleProgram(gpu::Batch& batch, bool textured, bool culled,130gpu::PipelinePointer DeferredLightingEffect::bindSimpleProgram(gpu::Batch& batch, bool textured, bool culled,
131 bool emmisive, bool depthBias) {131 bool emissive, bool depthBias) {
132 SimpleProgramKey config{textured, culled, emmisive, depthBias};132 SimpleProgramKey config{textured, culled, emissive, depthBias};
133 gpu::PipelinePointer pipeline = getPipeline(config);133 gpu::PipelinePointer pipeline = getPipeline(config);
134 batch.setPipeline(pipeline);134 batch.setPipeline(pipeline);
135 135