diff --git a/WickedEngine/generateMIPChain2D_GaussianCS.hlsl b/WickedEngine/generateMIPChain2D_GaussianCS.hlsl index 8a8dc7fff..69b2a5596 100644 --- a/WickedEngine/generateMIPChain2D_GaussianCS.hlsl +++ b/WickedEngine/generateMIPChain2D_GaussianCS.hlsl @@ -8,6 +8,8 @@ globallycoherent RWTEXTURE2D(input_output, float4, 0); [numthreads(GENERATEMIPCHAIN_2D_BLOCK_SIZE, GENERATEMIPCHAIN_2D_BLOCK_SIZE, 1)] void main(uint3 DTid : SV_DispatchThreadID) { +#ifndef SHADERCOMPILER_SPIRV + // Query the texture dimensions (width, height): uint2 dim; input_output.GetDimensions(dim.x, dim.y); @@ -44,4 +46,6 @@ void main(uint3 DTid : SV_DispatchThreadID) DeviceMemoryBarrier(); input_output[DTid.xy] = sum; } + +#endif } \ No newline at end of file diff --git a/WickedEngine/generateMIPChain3D_GaussianCS.hlsl b/WickedEngine/generateMIPChain3D_GaussianCS.hlsl index eef0d1b34..e179217d2 100644 --- a/WickedEngine/generateMIPChain3D_GaussianCS.hlsl +++ b/WickedEngine/generateMIPChain3D_GaussianCS.hlsl @@ -8,6 +8,8 @@ globallycoherent RWTEXTURE3D(input_output, float4, 0); [numthreads(GENERATEMIPCHAIN_3D_BLOCK_SIZE, GENERATEMIPCHAIN_3D_BLOCK_SIZE, GENERATEMIPCHAIN_3D_BLOCK_SIZE)] void main(uint3 DTid : SV_DispatchThreadID) { +#ifndef SHADERCOMPILER_SPIRV + // Query the texture dimensions (width, height, depth): uint3 dim; input_output.GetDimensions(dim.x, dim.y, dim.z); @@ -56,4 +58,6 @@ void main(uint3 DTid : SV_DispatchThreadID) DeviceMemoryBarrier(); input_output[DTid] = sum; } + +#endif } \ No newline at end of file diff --git a/WickedEngine/wiGraphicsDevice_Vulkan.cpp b/WickedEngine/wiGraphicsDevice_Vulkan.cpp index 3dffc59b7..88656986f 100644 --- a/WickedEngine/wiGraphicsDevice_Vulkan.cpp +++ b/WickedEngine/wiGraphicsDevice_Vulkan.cpp @@ -4336,10 +4336,10 @@ namespace wiGraphicsTypes } void GraphicsDevice_Vulkan::Dispatch(UINT threadGroupCountX, UINT threadGroupCountY, UINT threadGroupCountZ, GRAPHICSTHREAD threadID) { - renderPass[threadID].disable(GetDirectCommandList(threadID)); + //renderPass[threadID].disable(GetDirectCommandList(threadID)); - GetFrameResources().ResourceDescriptorsGPU[threadID]->validate(GetDirectCommandList(threadID)); - vkCmdDispatch(GetDirectCommandList(threadID), threadGroupCountX, threadGroupCountY, threadGroupCountZ); + //GetFrameResources().ResourceDescriptorsGPU[threadID]->validate(GetDirectCommandList(threadID)); + //vkCmdDispatch(GetDirectCommandList(threadID), threadGroupCountX, threadGroupCountY, threadGroupCountZ); //VkMemoryBarrier barrier; //barrier.sType = VK_STRUCTURE_TYPE_MEMORY_BARRIER; diff --git a/shadercompilers/dxc.exe b/shadercompilers/dxc.exe index 535017917..9fc87980a 100644 Binary files a/shadercompilers/dxc.exe and b/shadercompilers/dxc.exe differ diff --git a/shadercompilers/dxcompiler.dll b/shadercompilers/dxcompiler.dll index 402fd6f2a..3d73cd59f 100644 Binary files a/shadercompilers/dxcompiler.dll and b/shadercompilers/dxcompiler.dll differ