Fix part of T53497: Eevee stuttering on macOS for the first few seconds of usage.

The problem was that textures were assigned to different slots on different draw
calls, which caused shader specialization/patching by the driver. So the shader
would be compiled over and over until all possible assignments were used.

1 files changed, 8 insertions, 0 deletions

diff --git a/source/blender/draw/intern/draw_manager_exec.c b/source/blender/draw/intern/draw_manager_exec.c
index 58cd6ce44c6..e69a1026815 100644
--- a/source/blender/draw/intern/draw_manager_exec.c
+++ b/source/blender/draw/intern/draw_manager_exec.c
@@ -861,6 +861,10 @@ static void release_texture_slots(bool with_persist)
 				DST.RST.bound_tex_slots[i] = BIND_NONE;
 		}
 	}
+
+	/* Reset so that slots are consistenly assigned for different shader
+	 * draw calls, to avoid shader specialization/patching by the driver. */
+	DST.RST.bind_tex_inc = 0;
 }
 
 static void release_ubo_slots(bool with_persist)
@@ -874,6 +878,10 @@ static void release_ubo_slots(bool with_persist)
 				DST.RST.bound_ubo_slots[i] = BIND_NONE;
 		}
 	}
+
+	/* Reset so that slots are consistenly assigned for different shader
+	 * draw calls, to avoid shader specialization/patching by the driver. */
+	DST.RST.bind_ubo_inc = 0;
 }
 
 static void draw_shgroup(DRWShadingGroup *shgroup, DRWState pass_state)