History

always push default haze to current frame

SamGondelman committed 8 years ago

Commit a9d5dda1 parent eb0d0935 files · +4 −6Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+2−2
@@ -71,12 +71,12 @@ enum DeferredShader_BufferSlot { · 70 unmodified lines
71 SCATTERING_PARAMETERS_BUFFER_SLOT,71 SCATTERING_PARAMETERS_BUFFER_SLOT,
72 LIGHTING_MODEL_BUFFER_SLOT = render::ShapePipeline::Slot::LIGHTING_MODEL,72 LIGHTING_MODEL_BUFFER_SLOT = render::ShapePipeline::Slot::LIGHTING_MODEL,
73 LIGHT_GPU_SLOT = render::ShapePipeline::Slot::LIGHT,73 LIGHT_GPU_SLOT = render::ShapePipeline::Slot::LIGHT,
74 LIGHT_AMBIENT_SLOT,74 LIGHT_AMBIENT_SLOT = render::ShapePipeline::Slot::LIGHT_AMBIENT_BUFFER,
75 HAZE_MODEL_BUFFER_SLOT = render::ShapePipeline::Slot::HAZE_MODEL,
75 LIGHT_INDEX_GPU_SLOT,76 LIGHT_INDEX_GPU_SLOT,
76 LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT,77 LIGHT_CLUSTER_GRID_FRUSTUM_GRID_SLOT,
77 LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT,78 LIGHT_CLUSTER_GRID_CLUSTER_GRID_SLOT,
78 LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,79 LIGHT_CLUSTER_GRID_CLUSTER_CONTENT_SLOT,
79 HAZE_MODEL_BUFFER_SLOT
80};80};
81 81
82static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);82static void loadLightProgram(const char* vertSource, const char* fragSource, bool lightVolume, gpu::PipelinePointer& program, LightLocationsPtr& locations);