History

Switched to uniforms for sending fade shader data. Moved more fade functions to FadeEffect class

Olivier Prat committed 9 years ago

Commit de143d01 parent a9ab9d26 files · +60 −84Browse files

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

Unified · Split

libraries/render-utils/src/RenderDeferredTask.cpp+2−4
@@ -258,7 +258,6 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& · 257 unmodified lines
258 258
259 RenderArgs* args = renderContext->args;259 RenderArgs* args = renderContext->args;
260 ShapeKey::Builder defaultKeyBuilder = DependencyManager::get<FadeEffect>()->getKeyBuilder();260 ShapeKey::Builder defaultKeyBuilder = DependencyManager::get<FadeEffect>()->getKeyBuilder();
261 gpu::TexturePointer fadeMaskMap = DependencyManager::get<FadeEffect>()->getFadeMaskMap();
262 261
263 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {262 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
264 args->_batch = &batch;263 args->_batch = &batch;
@@ -285,7 +284,7 @@ void DrawDeferred::run(const RenderContextPointer& renderContext, const Inputs& · 20 unmodified lines
285 }284 }
286 285
287 // Prepare fade effect286 // Prepare fade effect
288 batch.setResourceTexture(ShapePipeline::Slot::MAP::FADE_MASK, fadeMaskMap);287 DependencyManager::get<FadeEffect>()->bindPerBatch(batch);
289 288
290 ShapeKey globalKey = keyBuilder.build();289 ShapeKey globalKey = keyBuilder.build();
291 args->_globalShapeKey = globalKey._flags.to_ulong();290 args->_globalShapeKey = globalKey._flags.to_ulong();
@@ -310,7 +309,6 @@ void DrawStateSortDeferred::run(const RenderContextPointer& renderContext, const · 18 unmodified lines
310 309
311 RenderArgs* args = renderContext->args;310 RenderArgs* args = renderContext->args;
312 ShapeKey::Builder defaultKeyBuilder = DependencyManager::get<FadeEffect>()->getKeyBuilder();311 ShapeKey::Builder defaultKeyBuilder = DependencyManager::get<FadeEffect>()->getKeyBuilder();
313 gpu::TexturePointer fadeMaskMap = DependencyManager::get<FadeEffect>()->getFadeMaskMap();
314 312
315 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {313 gpu::doInBatch(args->_context, [&](gpu::Batch& batch) {
316 args->_batch = &batch;314 args->_batch = &batch;
@@ -337,7 +335,7 @@ void DrawStateSortDeferred::run(const RenderContextPointer& renderContext, const · 20 unmodified lines
337 }335 }
338 336
339 // Prepare fade effect337 // Prepare fade effect
340 batch.setResourceTexture(ShapePipeline::Slot::MAP::FADE_MASK, fadeMaskMap);338 DependencyManager::get<FadeEffect>()->bindPerBatch(batch);
341 339
342 ShapeKey globalKey = keyBuilder.build();340 ShapeKey globalKey = keyBuilder.build();
343 args->_globalShapeKey = globalKey._flags.to_ulong();341 args->_globalShapeKey = globalKey._flags.to_ulong();