Panagiotis Christopoulos Charitos 1 year ago
parent
commit
bae79bbcc2

+ 5 - 7
AnKi/Core/App.cpp

@@ -223,13 +223,11 @@ Error App::initInternal()
 		"NOT built with tracing";
 #endif
 
-	ANKI_CORE_LOGI("Initializing application ("
-				   "version %u.%u, "
-				   "%s, "
-				   "compiler %s, "
-				   "build date %s, "
-				   "commit %s)",
-				   ANKI_VERSION_MAJOR, ANKI_VERSION_MINOR, buildType, ANKI_COMPILER_STR, __DATE__, ANKI_REVISION);
+	ANKI_CORE_LOGI("Initializing application");
+	ANKI_CORE_LOGI("\tBuild type %s", buildType);
+	ANKI_CORE_LOGI("\tBuild time %s %s", __DATE__, __TIME__);
+	ANKI_CORE_LOGI("\tCompiler %s", ANKI_COMPILER_STR);
+	ANKI_CORE_LOGI("\tCommit %s", ANKI_REVISION);
 
 // Check SIMD support
 #if ANKI_SIMD_SSE && ANKI_COMPILER_GCC_COMPATIBLE

+ 2 - 0
AnKi/Importer/GltfImporterMesh.cpp

@@ -696,6 +696,8 @@ Error GltfImporter::writeMeshInternal(const cgltf_mesh& mesh) const
 		maxLod = lod;
 	}
 
+	ANKI_IMPORTER_LOGV("Mesh lod count: %s %u", fname.cstr(), maxLod + 1);
+
 	// Meshletize
 	for(U32 lod = 0; lod < m_lodCount; ++lod)
 	{

+ 0 - 11
AnKi/Renderer/LightShading.cpp

@@ -39,11 +39,6 @@ Error LightShading::init()
 		err = initApplyFog();
 	}
 
-	if(!err)
-	{
-		err = initApplyIndirect();
-	}
-
 	if(err)
 	{
 		ANKI_R_LOGE("Failed to init light stage");
@@ -104,12 +99,6 @@ Error LightShading::initApplyFog()
 	return Error::kNone;
 }
 
-Error LightShading::initApplyIndirect()
-{
-	ANKI_CHECK(loadShaderProgram("ShaderBinaries/LightShadingApplyIndirect.ankiprogbin", m_applyIndirect.m_prog, m_applyIndirect.m_grProg));
-	return Error::kNone;
-}
-
 void LightShading::run(const RenderingContext& ctx, RenderPassWorkContext& rgraphCtx)
 {
 	ANKI_TRACE_SCOPED_EVENT(LightShading);

+ 0 - 8
AnKi/Renderer/LightShading.h

@@ -50,13 +50,6 @@ private:
 		Array<ShaderProgramPtr, 2> m_grProgs;
 	} m_skybox;
 
-	class
-	{
-	public:
-		ShaderProgramResourcePtr m_prog;
-		ShaderProgramPtr m_grProg;
-	} m_applyIndirect;
-
 	class
 	{
 	public:
@@ -76,7 +69,6 @@ private:
 	Error initLightShading();
 	Error initSkybox();
 	Error initApplyFog();
-	Error initApplyIndirect();
 
 	void run(const RenderingContext& ctx, RenderPassWorkContext& rgraphCtx);
 

+ 3 - 1
AnKi/Renderer/Utils/Drawer.cpp

@@ -72,7 +72,6 @@ void RenderableDrawer::setState(const RenderableDrawerArguments& args, CommandBu
 	cmdb.bindSampler(U32(MaterialSet::kGlobal), U32(MaterialBinding::kNearestClampSampler), getRenderer().getSamplers().m_nearestNearestClamp.get());
 
 	// Misc
-	cmdb.setVertexAttribute(0, 0, Format::kR32G32B32A32_Uint, 0);
 	cmdb.bindIndexBuffer(&UnifiedGeometryBuffer::getSingleton().getBuffer(), 0, IndexType::kU16);
 }
 
@@ -245,6 +244,7 @@ void RenderableDrawer::drawMdi(const RenderableDrawerArguments& args, CommandBuf
 
 		if(it->m_drawType == 0)
 		{
+			cmdb.setVertexAttribute(0, 0, Format::kR32G32B32A32_Uint, 0);
 			cmdb.bindVertexBuffer(0, it->m_legacyDraw.m_instancesBuffer, it->m_legacyDraw.m_instancesBufferOffset, sizeof(GpuSceneRenderableInstance),
 								  VertexStepRate::kInstance);
 
@@ -255,6 +255,7 @@ void RenderableDrawer::drawMdi(const RenderableDrawerArguments& args, CommandBuf
 		}
 		else if(it->m_drawType == 1)
 		{
+			cmdb.setVertexAttribute(0, 0, Format::kR32G32B32A32_Uint, 0);
 			cmdb.bindVertexBuffer(0, it->m_legacyDraw.m_instancesBuffer, it->m_legacyDraw.m_instancesBufferOffset, sizeof(GpuSceneRenderableInstance),
 								  VertexStepRate::kInstance);
 
@@ -275,6 +276,7 @@ void RenderableDrawer::drawMdi(const RenderableDrawerArguments& args, CommandBuf
 		{
 			ANKI_ASSERT(it->m_drawType == 3);
 
+			cmdb.setVertexAttribute(0, 0, Format::kR32_Uint, 0);
 			cmdb.bindVertexBuffer(0, it->m_swMeshDraw.m_instancesBuffer, it->m_swMeshDraw.m_instancesBufferOffset, sizeof(GpuSceneMeshletInstance),
 								  VertexStepRate::kInstance);