[Scummvm-git-logs] scummvm master -> 159168cb70b557bb9fb74d0829ec0598d179c09a

[neuromancer]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
159168cb70 FREESCAPE: Fix for #15486 TINYGL: triangles always override zbuffer from lines


Commit: 159168cb70b557bb9fb74d0829ec0598d179c09a
    https://github.com/scummvm/scummvm/commit/159168cb70b557bb9fb74d0829ec0598d179c09a
Author: Chance.H (chancewithchance at outlook.com)
Date: 2025-04-01T12:27:29+02:00

Commit Message:
FREESCAPE: Fix for #15486 TINYGL: triangles always override zbuffer from lines

Changed paths:
    engines/freescape/area.cpp
    graphics/tinygl/zbuffer.h


diff --git a/engines/freescape/area.cpp b/engines/freescape/area.cpp
index ba5c4071ac8..1f0e81736ff 100644
--- a/engines/freescape/area.cpp
+++ b/engines/freescape/area.cpp
@@ -359,10 +359,6 @@ void Area::draw(Freescape::Renderer *gfx, uint32 animationTicks, Math::Vector3d
 		}
 	}
 
-	// In theory, the ordering of the rendering should not matter,
-	// however, it seems that rendering the planar objects first
-	// triggers a bug in TinyGL where certain objects such as lines,
-	// are not rendered correctly. This is a workaround for that issue.
 	for (auto &obj : nonPlanarObjects) {
 		obj->draw(gfx);
 	}
diff --git a/graphics/tinygl/zbuffer.h b/graphics/tinygl/zbuffer.h
index 27389a936f6..4c5389a1b3f 100644
--- a/graphics/tinygl/zbuffer.h
+++ b/graphics/tinygl/zbuffer.h
@@ -419,7 +419,7 @@ private:
 
 	template <bool kEnableAlphaTest, bool kBlendingEnabled, bool kDepthWrite>
 	FORCEINLINE void writePixel(int pixel, byte aSrc, byte rSrc, byte gSrc, byte bSrc, uint z) {
-		writePixel<kEnableAlphaTest, kBlendingEnabled, false, false>(pixel, aSrc, rSrc, gSrc, bSrc, z, 0.0f, 0, 0, 0);
+		writePixel<kEnableAlphaTest, kBlendingEnabled, kDepthWrite, false>(pixel, aSrc, rSrc, gSrc, bSrc, z, 0.0f, 0, 0, 0);
 	}
 
 	template <bool kEnableAlphaTest, bool kBlendingEnabled, bool kDepthWrite, bool kFogMode>