From 5a889977895b45b256fb2d5aacb8edbbcb747528 Mon Sep 17 00:00:00 2001
From: Jerome St-Louis <jerome@ecere.com>
Date: Tue, 25 Jan 2022 01:33:33 -0500
Subject: [PATCH] ecere/gfx/drivers/GL: Automatically flushing matrices before
 switching shaders - Matrix stacks get mixed up otherwise resulting in
 confusion

---
 ecere/src/gfx/drivers/gl3/shaders.ec | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/ecere/src/gfx/drivers/gl3/shaders.ec b/ecere/src/gfx/drivers/gl3/shaders.ec
index 1811bfd146..4a875bb1cc 100644
--- a/ecere/src/gfx/drivers/gl3/shaders.ec
+++ b/ecere/src/gfx/drivers/gl3/shaders.ec
@@ -313,7 +313,10 @@ public:
       if(!glCaps_shaders) return false;
 
       if(activeShader != this)
+      {
+         GLFlushMatrices(); // Must flush matrices before switching shader otherwise the matrix stacks may get mixed up
          activeShader = this;
+      }
 
       result = true;
       if(activeState != state || !shader)