maxmustermann/armory
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Auto exposure fixes

Browse source
This commit is contained in:
luboslenco 2019-04-23 12:05:50 +02:00
parent 54bb309807
commit faae72e5e4
2 changed files with 7 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

59
Sources/armory/renderpath/RenderPathDeferred.hx
View file

@ -274,43 +274,7 @@ class RenderPathDeferred {
#if rp_autoexposure
{
var t = new RenderTargetRaw();
t.name = "histogram0";
t.width = 0;
t.height = 0;
t.scale = 1 / 4;
t.format = Inc.getHdrFormat();
path.createRenderTarget(t);
}
{
var t = new RenderTargetRaw();
t.name = "histogram1";
t.width = 0;
t.height = 0;
t.scale = 1 / 8;
t.format = Inc.getHdrFormat();
path.createRenderTarget(t);
}
{
var t = new RenderTargetRaw();
t.name = "histogram2";
t.width = 0;
t.height = 0;
t.scale = 1 / 16;
t.format = Inc.getHdrFormat();
path.createRenderTarget(t);
}
{
var t = new RenderTargetRaw();
t.name = "histogram3";
t.width = 0;
t.height = 0;
t.scale = 1 / 32;
t.format = Inc.getHdrFormat();
path.createRenderTarget(t);
}
{
var t = new RenderTargetRaw();
t.name = "histogram4";
t.name = "histogram";
t.width = 1;
t.height = 1;
t.format = Inc.getHdrFormat();
@ -318,7 +282,6 @@ class RenderPathDeferred {
}
{
path.loadShader("shader_datas/copy_pass/copy_pass");
path.loadShader("shader_datas/histogram_pass/histogram_pass");
}
#end
@ -807,20 +770,12 @@ class RenderPathDeferred {
// Begin compositor
#if rp_autoexposure
{
path.setTarget("histogram0");
path.bindTarget("tex", "tex");
path.drawShader("shader_datas/copy_pass/copy_pass");
path.setTarget("histogram1");
path.bindTarget("histogram0", "tex");
path.drawShader("shader_datas/copy_pass/copy_pass");
path.setTarget("histogram2");
path.bindTarget("histogram1", "tex");
path.drawShader("shader_datas/copy_pass/copy_pass");
path.setTarget("histogram3");
path.bindTarget("histogram2", "tex");
path.drawShader("shader_datas/copy_pass/copy_pass");
path.setTarget("histogram4");
path.setTarget("histogram");
#if (rp_antialiasing == "TAA")
path.bindTarget("taa", "tex");
#else
path.bindTarget("tex", "tex");
#end
path.drawShader("shader_datas/histogram_pass/histogram_pass");
}
#end
@ -854,7 +809,7 @@ class RenderPathDeferred {
#if rp_autoexposure
{
path.bindTarget("histogram4", "histogram");
path.bindTarget("histogram", "histogram");
}
#end

1
blender/arm/make_renderpath.py
View file

@ -302,7 +302,6 @@ def build():
if rpdat.rp_compositornodes and rpdat.rp_autoexposure:
assets.add_khafile_def('rp_autoexposure')
assets.add_shader_pass('copy_pass')
assets.add_shader_pass('histogram_pass')
if rpdat.rp_dynres: