From 1e30b083630fa8a538955a2c4b4d7633a9fbea2e Mon Sep 17 00:00:00 2001
From: Robert Beckebans <robert.beckebans@gmail.com>
Date: Mon, 15 Aug 2022 14:20:19 +0200
Subject: [PATCH] SP: Fix null indexbuffer issue when the validation layers are
 enabled

---
 neo/renderer/NVRHI/RenderBackend_NVRHI.cpp |  4 ++++
 neo/renderer/RenderBackend.cpp             | 10 ++++++++++
 2 files changed, 14 insertions(+)

diff --git a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp
index e9d75801..54bbaffd 100644
--- a/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp
+++ b/neo/renderer/NVRHI/RenderBackend_NVRHI.cpp
@@ -178,7 +178,11 @@ void idRenderBackend::Init()
 	prevMVP[1] = renderMatrix_identity;
 	prevViewsValid = false;
 
+	currentVertexBuffer = nullptr;
+	currentIndexBuffer = nullptr;
 	currentJointBuffer = nullptr;
+	currentVertexOffset = 0;
+	currentIndexOffset = 0;
 	currentJointOffset = 0;
 
 	// RB: prepare ImGui system
diff --git a/neo/renderer/RenderBackend.cpp b/neo/renderer/RenderBackend.cpp
index d6af32f7..b4e0113c 100644
--- a/neo/renderer/RenderBackend.cpp
+++ b/neo/renderer/RenderBackend.cpp
@@ -6738,6 +6738,16 @@ void idRenderBackend::DrawViewInternal( const viewDef_t* _viewDef, const int ste
 		}
 	}
 
+#if defined( USE_NVRHI )
+	// SP: reset the graphics state for validation layers
+	currentVertexBuffer = nullptr;
+	currentIndexBuffer = nullptr;
+	currentJointBuffer = nullptr;
+	currentVertexOffset = 0;
+	currentIndexOffset = 0;
+	currentJointOffset = 0;
+#endif
+
 	//-------------------------------------------------
 	// RB_BeginDrawingView
 	//