Fix: Initializing depth pass properties when starting with shadows disabled

past-due · pull[bot] · commit 11544d825fc2 · 2024-01-24T20:32:49.000Z
Always call pie_setShadowMode() on init
diff --git a/lib/ivis_opengl/piedraw.cpp b/lib/ivis_opengl/piedraw.cpp
@@ -66,6 +66,7 @@ static size_t pieCount = 0;
 static size_t polyCount = 0;
 static size_t drawCallsCount = 0;
 static bool shadows = false;
+static bool shadowsHasBeenInit = false;
 static ShadowMode shadowMode = ShadowMode::Shadow_Mapping;
 static gfx_api::gfxFloat lighting0[LIGHT_MAX][4];
 static gfx_api::gfxFloat lightingDefault[LIGHT_MAX][4];
@@ -161,7 +162,7 @@ uint32_t pie_getShadowMapResolution()
 
 bool pie_setShadowMode(ShadowMode mode)
 {
-	if (mode == shadowMode)
+	if (mode == shadowMode && shadowsHasBeenInit)
 	{
 		return true;
 	}
@@ -179,6 +180,7 @@ bool pie_setShadowMode(ShadowMode mode)
 	}
 	shadowMode = mode;
 	refreshShadowShaders();
+	shadowsHasBeenInit = true;
 	return successfulChangeToInputMode;
 }
 
diff --git a/lib/ivis_opengl/piestate.cpp b/lib/ivis_opengl/piestate.cpp
@@ -124,6 +124,7 @@ bool pie_LoadShaders(uint32_t shadowFilterSize)
 	// note: actual loading of shaders now occurs in gfx_api
 
 	// initialize gfx context shadow constants (must happen after context is initialized)
+	ASSERT(gfx_api::context::isInitialized(), "gfx context isn't initialized?");
 	auto shadowConstants = gfx_api::context::get().getShadowConstants();
 	shadowConstants.shadowFilterSize = shadowFilterSize;
 	gfx_api::context::get().setShadowConstants(shadowConstants);
@@ -132,6 +133,10 @@ bool pie_LoadShaders(uint32_t shadowFilterSize)
 	{
 		pie_setShadowMode(ShadowMode::Fallback_Stencil_Shadows);
 	}
+	else
+	{
+		pie_setShadowMode(ShadowMode::Shadow_Mapping);
+	}
 
 	gfx_api::gfxUByte rect[] {
 		0, 255, 0, 255,

Original file line number	Diff line number	Diff line change
`@@ -66,6 +66,7 @@ static size_t pieCount = 0;`
`66`	`66`	`static size_t polyCount = 0;`
`67`	`67`	`static size_t drawCallsCount = 0;`
`68`	`68`	`static bool shadows = false;`
	`69`	`+static bool shadowsHasBeenInit = false;`
`69`	`70`	`static ShadowMode shadowMode = ShadowMode::Shadow_Mapping;`
`70`	`71`	`static gfx_api::gfxFloat lighting0[LIGHT_MAX][4];`
`71`	`72`	`static gfx_api::gfxFloat lightingDefault[LIGHT_MAX][4];`
`@@ -161,7 +162,7 @@ uint32_t pie_getShadowMapResolution()`
`161`	`162`
`162`	`163`	`bool pie_setShadowMode(ShadowMode mode)`
`163`	`164`	`{`
`164`		`- if (mode == shadowMode)`
	`165`	`+ if (mode == shadowMode && shadowsHasBeenInit)`
`165`	`166`	`{`
`166`	`167`	`return true;`
`167`	`168`	`}`
`@@ -179,6 +180,7 @@ bool pie_setShadowMode(ShadowMode mode)`
`179`	`180`	`}`
`180`	`181`	`shadowMode = mode;`
`181`	`182`	`refreshShadowShaders();`
	`183`	`+ shadowsHasBeenInit = true;`
`182`	`184`	`return successfulChangeToInputMode;`
`183`	`185`	`}`
`184`	`186`