nick/WickedEngine
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

depth of field and motion blur fixes #861

Browse Source
This commit is contained in:
Turánszki János
2024-06-11 07:50:06 +02:00
parent f2ef8ce7c1
commit 3348c35b11
4 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
WickedEngine/shaders/depthoffield_neighborhoodMaxCOCCS.hlsl
+6 -2
View File
@@ -15,11 +15,15 @@ static const uint tile_replicate = sqr(DEPTHOFFIELD_TILESIZE / 2 / POSTPROCESS_B
[numthreads(POSTPROCESS_BLOCKSIZE, POSTPROCESS_BLOCKSIZE, 1)]
void main(uint3 DTid : SV_DispatchThreadID)
{
uint2 dim;
output.GetDimensions(dim.x, dim.y);
if(any(DTid.xy >= dim))
return;
float min_depth = 1;
float max_coc = 0;
float min_coc = 1000000;
int2 dim;
tile_mindepth_maxcoc.GetDimensions(dim.x, dim.y);
for (int x = -1; x <= 1; ++x)
WickedEngine/shaders/motionblur_neighborhoodMaxVelocityCS.hlsl
+5
View File
@@ -15,6 +15,11 @@ static const uint tile_replicate = sqr(MOTIONBLUR_TILESIZE / POSTPROCESS_BLOCKSI
[numthreads(POSTPROCESS_BLOCKSIZE, POSTPROCESS_BLOCKSIZE, 1)]
void main(uint3 DTid : SV_DispatchThreadID)
{
uint2 dim;
output.GetDimensions(dim.x, dim.y);
if(any(DTid.xy >= dim))
return;
float max_magnitude = 0;
float2 max_velocity = 0;
float min_magnitude = 100000;
WickedEngine/wiRenderer.cpp
+17 -12
View File
@@ -14621,10 +14621,14 @@ void Postprocess_LightShafts(
}
void CreateDepthOfFieldResources(DepthOfFieldResources& res, XMUINT2 resolution)
{
XMUINT2 tile_count = {};
tile_count.x = (resolution.x + DEPTHOFFIELD_TILESIZE - 1) / DEPTHOFFIELD_TILESIZE;
tile_count.y = (resolution.y + DEPTHOFFIELD_TILESIZE - 1) / DEPTHOFFIELD_TILESIZE;
TextureDesc tile_desc;
tile_desc.type = TextureDesc::Type::TEXTURE_2D;
tile_desc.width = (resolution.x + DEPTHOFFIELD_TILESIZE - 1) / DEPTHOFFIELD_TILESIZE;
tile_desc.height = (resolution.y + DEPTHOFFIELD_TILESIZE - 1) / DEPTHOFFIELD_TILESIZE;
tile_desc.width = tile_count.x;
tile_desc.height = tile_count.y;
tile_desc.format = Format::R16G16_FLOAT;
tile_desc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemax);
@@ -14632,7 +14636,7 @@ void CreateDepthOfFieldResources(DepthOfFieldResources& res, XMUINT2 resolution)
tile_desc.format = Format::R16_FLOAT;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemin);
tile_desc.height = resolution.x;
tile_desc.height = resolution.y;
tile_desc.format = Format::R16G16_FLOAT;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemax_horizontal);
tile_desc.format = Format::R16_FLOAT;
@@ -14661,7 +14665,7 @@ void CreateDepthOfFieldResources(DepthOfFieldResources& res, XMUINT2 resolution)
device->CreateBuffer(&bufferdesc, nullptr, &res.buffer_tile_statistics);
bufferdesc.stride = sizeof(uint);
bufferdesc.size = tile_desc.width * tile_desc.height * bufferdesc.stride;
bufferdesc.size = tile_count.x * tile_count.y * bufferdesc.stride;
bufferdesc.misc_flags = ResourceMiscFlag::BUFFER_STRUCTURED;
bufferdesc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS;
device->CreateBuffer(&bufferdesc, nullptr, &res.buffer_tiles_earlyexit);
@@ -15057,22 +15061,23 @@ void Postprocess_Outline(
}
void CreateMotionBlurResources(MotionBlurResources& res, XMUINT2 resolution)
{
XMUINT2 tile_count = {};
tile_count.x = (resolution.x + MOTIONBLUR_TILESIZE - 1) / MOTIONBLUR_TILESIZE;
tile_count.y = (resolution.y + MOTIONBLUR_TILESIZE - 1) / MOTIONBLUR_TILESIZE;
TextureDesc tile_desc;
tile_desc.type = TextureDesc::Type::TEXTURE_2D;
tile_desc.width = (resolution.x + MOTIONBLUR_TILESIZE - 1) / MOTIONBLUR_TILESIZE;
tile_desc.height = (resolution.y + MOTIONBLUR_TILESIZE - 1) / MOTIONBLUR_TILESIZE;
tile_desc.format = Format::R16G16_FLOAT;
tile_desc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS;
tile_desc.width = tile_count.x;
tile_desc.height = tile_count.y;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemax);
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemin);
device->CreateTexture(&tile_desc, nullptr, &res.texture_neighborhoodmax);
tile_desc.format = Format::R16_FLOAT;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemin);
tile_desc.format = Format::R16G16_FLOAT;
tile_desc.height = resolution.y;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemax_horizontal);
tile_desc.format = Format::R16_FLOAT;
device->CreateTexture(&tile_desc, nullptr, &res.texture_tilemin_horizontal);
@@ -15084,7 +15089,7 @@ void CreateMotionBlurResources(MotionBlurResources& res, XMUINT2 resolution)
device->CreateBuffer(&bufferdesc, nullptr, &res.buffer_tile_statistics);
bufferdesc.stride = sizeof(uint);
bufferdesc.size = tile_desc.width * tile_desc.height * bufferdesc.stride;
bufferdesc.size = tile_count.x * tile_count.y * bufferdesc.stride;
bufferdesc.bind_flags = BindFlag::SHADER_RESOURCE | BindFlag::UNORDERED_ACCESS;
bufferdesc.misc_flags = ResourceMiscFlag::BUFFER_STRUCTURED;
device->CreateBuffer(&bufferdesc, nullptr, &res.buffer_tiles_earlyexit);
WickedEngine/wiVersion.cpp
+1 -1
View File
@@ -9,7 +9,7 @@ namespace wi::version
// minor features, major updates, breaking compatibility changes
const int minor = 71;
// minor bug fixes, alterations, refactors, updates
const int revision = 481;
const int revision = 482;
const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision);