[Scummvm-git-logs] scummvm master -> 462536c287e0e13a464cb7e8e75ea54e48d9d0cd

[lephilousophe]

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:
462536c287 GRIM: Fix text not displaying


Commit: 462536c287e0e13a464cb7e8e75ea54e48d9d0cd
    https://github.com/scummvm/scummvm/commit/462536c287e0e13a464cb7e8e75ea54e48d9d0cd
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-07-21T21:16:03+02:00

Commit Message:
GRIM: Fix text not displaying

The setUniform function was not called on the active shader which got
deactivated.

Changed paths:
    engines/grim/gfx_opengl_shaders.cpp


diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index 803547feb27..2edc7aa5a18 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -1694,7 +1694,7 @@ void GfxOpenGLS::drawTextObject(const TextObject *text) {
 	Math::Vector3d colors(float(td->color.getRed()) / 255.0f,
 	                      float(td->color.getGreen()) / 255.0f,
 	                      float(td->color.getBlue()) / 255.0f);
-	_textProgram->setUniform("color", colors);
+	td->shader->setUniform("color", colors);
 	glBindTexture(GL_TEXTURE_2D, td->texture);
 	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _quadEBO);
 	glDrawElements(GL_TRIANGLES, td->characters * 6, GL_UNSIGNED_SHORT, nullptr);