History

Bringing Beckmann specular to the lighting

samcake committed 10 years ago

Commit 9a604d01 parent 6425a1614 files · +207 −19Browse files

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

Unified · Split

libraries/render-utils/src/DeferredLightingEffect.cpp+4−0
@@ -62,6 +62,7 @@ enum DeferredShader_MapSlot { · 61 unmodified lines
62 DEFERRED_BUFFER_CURVATURE_UNIT,62 DEFERRED_BUFFER_CURVATURE_UNIT,
63 DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT,63 DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT,
64 SCATTERING_LUT_UNIT,64 SCATTERING_LUT_UNIT,
65 SCATTERING_SPECULAR_UNIT,
65};66};
66enum DeferredShader_BufferSlot {67enum DeferredShader_BufferSlot {
67 DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT = 0,68 DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT = 0,
@@ -175,6 +176,7 @@ static void loadLightProgram(const char* vertSource, const char* fragSource, boo · 107 unmodified lines
175 slotBindings.insert(gpu::Shader::Binding(std::string("curvatureMap"), DEFERRED_BUFFER_CURVATURE_UNIT));176 slotBindings.insert(gpu::Shader::Binding(std::string("curvatureMap"), DEFERRED_BUFFER_CURVATURE_UNIT));
176 slotBindings.insert(gpu::Shader::Binding(std::string("diffusedCurvatureMap"), DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT));177 slotBindings.insert(gpu::Shader::Binding(std::string("diffusedCurvatureMap"), DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT));
177 slotBindings.insert(gpu::Shader::Binding(std::string("scatteringLUT"), SCATTERING_LUT_UNIT));178 slotBindings.insert(gpu::Shader::Binding(std::string("scatteringLUT"), SCATTERING_LUT_UNIT));
179 slotBindings.insert(gpu::Shader::Binding(std::string("scatteringSpecularBeckmann"), SCATTERING_SPECULAR_UNIT));
178 180
179 181
180 slotBindings.insert(gpu::Shader::Binding(std::string("deferredFrameTransformBuffer"), DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT));182 slotBindings.insert(gpu::Shader::Binding(std::string("deferredFrameTransformBuffer"), DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT));
@@ -399,6 +401,7 @@ void RenderDeferredSetup::run(const render::SceneContextPointer& sceneContext, c · 218 unmodified lines
399 401
400 402
401 batch.setResourceTexture(SCATTERING_LUT_UNIT, subsurfaceScatteringResource->getScatteringTable());403 batch.setResourceTexture(SCATTERING_LUT_UNIT, subsurfaceScatteringResource->getScatteringTable());
404 batch.setResourceTexture(SCATTERING_SPECULAR_UNIT, subsurfaceScatteringResource->getScatteringSpecular());
402 405
403 406
404 // Global directional light and ambient pass407 // Global directional light and ambient pass
@@ -593,6 +596,7 @@ void RenderDeferredCleanup::run(const render::SceneContextPointer& sceneContext, · 188 unmodified lines
593 batch.setResourceTexture(DEFERRED_BUFFER_CURVATURE_UNIT, nullptr);596 batch.setResourceTexture(DEFERRED_BUFFER_CURVATURE_UNIT, nullptr);
594 batch.setResourceTexture(DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT, nullptr);597 batch.setResourceTexture(DEFERRED_BUFFER_DIFFUSED_CURVATURE_UNIT, nullptr);
595 batch.setResourceTexture(SCATTERING_LUT_UNIT, nullptr);598 batch.setResourceTexture(SCATTERING_LUT_UNIT, nullptr);
599 batch.setResourceTexture(SCATTERING_SPECULAR_UNIT, nullptr);
596 600
597 batch.setUniformBuffer(SCATTERING_PARAMETERS_BUFFER_SLOT, nullptr);601 batch.setUniformBuffer(SCATTERING_PARAMETERS_BUFFER_SLOT, nullptr);
598 batch.setUniformBuffer(DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT, nullptr);602 batch.setUniformBuffer(DEFERRED_FRAME_TRANSFORM_BUFFER_SLOT, nullptr);

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t