From 98eadce6c1782c54730292d4b829cfe6a2acee06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tur=C3=A1nszki=20J=C3=A1nos?= Date: Sun, 20 Nov 2022 23:09:43 +0100 Subject: [PATCH] possible fix for #581 --- WickedEngine/shaders/globals.hlsli | 3 ++- WickedEngine/shaders/surfaceHF.hlsli | 1 - WickedEngine/wiRenderer.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/WickedEngine/shaders/globals.hlsli b/WickedEngine/shaders/globals.hlsli index 101d93ceb..a85bcb209 100644 --- a/WickedEngine/shaders/globals.hlsli +++ b/WickedEngine/shaders/globals.hlsli @@ -13,8 +13,9 @@ "RootConstants(num32BitConstants=12, b999), " \ "CBV(b0), " \ "CBV(b1), " \ + "CBV(b2), " \ "DescriptorTable( " \ - "CBV(b2, numDescriptors = 12, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)," \ + "CBV(b3, numDescriptors = 11, flags = DATA_STATIC_WHILE_SET_AT_EXECUTE)," \ "SRV(t0, numDescriptors = 16, flags = DESCRIPTORS_VOLATILE | DATA_STATIC_WHILE_SET_AT_EXECUTE)," \ "UAV(u0, numDescriptors = 16, flags = DESCRIPTORS_VOLATILE | DATA_STATIC_WHILE_SET_AT_EXECUTE)" \ ")," \ diff --git a/WickedEngine/shaders/surfaceHF.hlsli b/WickedEngine/shaders/surfaceHF.hlsli index 9b0258d9f..7f47a7b69 100644 --- a/WickedEngine/shaders/surfaceHF.hlsli +++ b/WickedEngine/shaders/surfaceHF.hlsli @@ -401,7 +401,6 @@ struct Surface [branch] if (material.textures[BASECOLORMAP].IsValid()) { - uint prt_status = 0; #ifdef SURFACE_LOAD_QUAD_DERIVATIVES float4 baseColorMap = material.textures[BASECOLORMAP].SampleGrad(sam, uvsets, uvsets_dx, uvsets_dy); #else diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index 5a19258d2..0b9783bd2 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -3969,7 +3969,7 @@ void UpdateRenderData( } // Impostor prepare: - if (vis.scene->instanceArraySize > 0 && vis.scene->meshletBuffer.IsValid()) + if (vis.scene->impostors.GetCount() > 0 && vis.scene->objects.GetCount() > 0 && vis.scene->impostorBuffer.IsValid()) { device->EventBegin("Impostor prepare", cmd); auto range = wi::profiler::BeginRangeGPU("Impostor prepare", cmd);