Pārlūkot izejas kodu

Bug fix: Add NonUniform on mesh shaders as well

Panagiotis Christopoulos Charitos 1 mēnesi atpakaļ
vecāks
revīzija
7653c0f075

+ 0 - 3
AnKi/GpuMemory/GpuSceneBuffer.h

@@ -187,9 +187,6 @@ public:
 	void endPatching()
 	{
 		ANKI_ASSERT(m_bPatchingMode.fetchSub(1) == 1);
-#if ANKI_ASSERTIONS_ENABLED
-		m_patchingMode = false;
-#endif
 	}
 
 	// 4th optional thing to call. Check if there is a need to call patchGpuScene or if no copies are needed

+ 2 - 1
AnKi/Shaders/GBufferGeneric.ankiprog

@@ -71,6 +71,7 @@
 #define REALLY_VELOCITY ((ANKI_VELOCITY || ANKI_BONES) && GBUFFER)
 #define NORMAL_MAPPING (GBUFFER && NORMAL_TEX)
 #define SW_MESHLETS (ANKI_TECHNIQUE_GBufferSwMeshletRendering || ANKI_TECHNIQUE_ShadowsSwMeshletRendering)
+#define MESH_SHADING (ANKI_TECHNIQUE_GBufferMeshShaders || ANKI_TECHNIQUE_ShadowsMeshShaders)
 
 #define VISUALIZE_MESHLETS (0 && GBUFFER)
 #define PRIMITIVE_BACKFACE_CULLING 1
@@ -438,7 +439,7 @@ main(U32 svGroupId : SV_GROUPID, U32 svGroupIndex : SV_GROUPINDEX, out vertices
 // ===========================================================================
 #if ANKI_PIXEL_SHADER
 
-#	if SW_MESHLETS
+#	if SW_MESHLETS || MESH_SHADING
 #		define BINDLESS(x) getBindlessTextureNonUniformIndex2DVec4(x)
 #	else
 #		define BINDLESS(x) getBindlessTexture2DVec4(x)

+ 1 - 1
Tests/Gr/GrWorkGraphs.cpp

@@ -10,7 +10,7 @@
 
 using namespace anki;
 
-static void clearSwapchain(CommandBufferPtr cmdb = CommandBufferPtr())
+[[maybe_unused]] static void clearSwapchain(CommandBufferPtr cmdb = CommandBufferPtr())
 {
 	const Bool continueCmdb = cmdb.isCreated();