From ff6bcee3a32108fa53dd84fcc83690566fa8b8c2 Mon Sep 17 00:00:00 2001 From: turanszkij Date: Tue, 8 May 2018 17:23:48 +0100 Subject: [PATCH] particle system sorting fix --- WickedEngine/ShaderInterop_EmittedParticle.h | 1 - WickedEngine/emittedparticle_sortCS.hlsl | 2 ++ WickedEngine/emittedparticle_sortInnerCS.hlsl | 2 ++ 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/WickedEngine/ShaderInterop_EmittedParticle.h b/WickedEngine/ShaderInterop_EmittedParticle.h index 8f6e0fe2e..fbb1fab85 100644 --- a/WickedEngine/ShaderInterop_EmittedParticle.h +++ b/WickedEngine/ShaderInterop_EmittedParticle.h @@ -62,7 +62,6 @@ CBUFFER(SortConstants, 0) { int4 job_params; }; -#define SORT_SIZE 512 #define THREADCOUNT_EMIT 256 #define THREADCOUNT_SIMULATION 256 diff --git a/WickedEngine/emittedparticle_sortCS.hlsl b/WickedEngine/emittedparticle_sortCS.hlsl index 3cbf06be9..61c0d971b 100644 --- a/WickedEngine/emittedparticle_sortCS.hlsl +++ b/WickedEngine/emittedparticle_sortCS.hlsl @@ -22,6 +22,8 @@ #include "ShaderInterop_EmittedParticle.h" +#define SORT_SIZE 4096 + #if( SORT_SIZE>4096 ) // won't work for arrays>4096 #error due to LDS size SORT_SIZE must be 4096 or smaller diff --git a/WickedEngine/emittedparticle_sortInnerCS.hlsl b/WickedEngine/emittedparticle_sortInnerCS.hlsl index 9c6ea65a8..2590ec0ec 100644 --- a/WickedEngine/emittedparticle_sortInnerCS.hlsl +++ b/WickedEngine/emittedparticle_sortInnerCS.hlsl @@ -22,6 +22,8 @@ #include "ShaderInterop_EmittedParticle.h" +#define SORT_SIZE 2048 + #if( SORT_SIZE>2048 ) #error #endif