[Scummvm-git-logs] scummvm master -> f3d7757d6be080370eecd5b864730427dbb86521

klusark noreply at scummvm.org
Wed Nov 11 00:15:28 UTC 2026


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

Summary:
3b8a7f7235 GRIM: Share one fragment shader between actors and sprites
f3d7757d6b GRIM: Draw the sprites of Grim in the OpenGL shaders renderer


Commit: 3b8a7f723525404fdd2adede328e42c70818863a
    https://github.com/scummvm/scummvm/commit/3b8a7f723525404fdd2adede328e42c70818863a
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-10T19:11:22-05:00

Commit Message:
GRIM: Share one fragment shader between actors and sprites

The actor, actor lights and sprite programs of each game used identical
copies of the same fragment shader. They now all load grim_object or
emi_object.

Assisted-by: Claude:claude-opus-5-5

Changed paths:
  A engines/grim/shaders/emi_object.fragment
  A engines/grim/shaders/grim_object.fragment
  R engines/grim/shaders/emi_actor.fragment
  R engines/grim/shaders/emi_actorlights.fragment
  R engines/grim/shaders/emi_sprite.fragment
  R engines/grim/shaders/grim_actor.fragment
  R engines/grim/shaders/grim_actorlights.fragment
    devtools/create_project/xcode.cpp
    dists/scummvm.rc
    engines/grim/gfx_opengl_shaders.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index eec924ae0ba..1918e8472bc 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1052,22 +1052,19 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
 			files.push_back("engines/grim/shaders/grim_dim.vertex");
 			files.push_back("engines/grim/shaders/grim_emerg.fragment");
 			files.push_back("engines/grim/shaders/grim_emerg.vertex");
-			files.push_back("engines/grim/shaders/emi_actor.fragment");
 			files.push_back("engines/grim/shaders/emi_actor.vertex");
-			files.push_back("engines/grim/shaders/emi_actorlights.fragment");
 			files.push_back("engines/grim/shaders/emi_actorlights.vertex");
 			files.push_back("engines/grim/shaders/emi_background.fragment");
 			files.push_back("engines/grim/shaders/emi_background.vertex");
 			files.push_back("engines/grim/shaders/emi_dimplane.fragment");
 			files.push_back("engines/grim/shaders/emi_dimplane.vertex");
-			files.push_back("engines/grim/shaders/emi_sprite.fragment");
+			files.push_back("engines/grim/shaders/emi_object.fragment");
 			files.push_back("engines/grim/shaders/emi_sprite.vertex");
-			files.push_back("engines/grim/shaders/grim_actor.fragment");
 			files.push_back("engines/grim/shaders/grim_actor.vertex");
-			files.push_back("engines/grim/shaders/grim_actorlights.fragment");
 			files.push_back("engines/grim/shaders/grim_actorlights.vertex");
 			files.push_back("engines/grim/shaders/grim_background.fragment");
 			files.push_back("engines/grim/shaders/grim_background.vertex");
+			files.push_back("engines/grim/shaders/grim_object.fragment");
 			files.push_back("engines/grim/shaders/grim_primitive.fragment");
 			files.push_back("engines/grim/shaders/grim_primitive.vertex");
 			files.push_back("engines/grim/shaders/grim_shadowplane.fragment");
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 219cfe4e1bf..55855a3dadd 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -52,22 +52,19 @@ shaders/grim_dim.fragment            FILE    "engines/grim/shaders/grim_dim.frag
 shaders/grim_dim.vertex              FILE    "engines/grim/shaders/grim_dim.vertex"
 shaders/grim_emerg.fragment          FILE    "engines/grim/shaders/grim_emerg.fragment"
 shaders/grim_emerg.vertex            FILE    "engines/grim/shaders/grim_emerg.vertex"
-shaders/emi_actor.fragment           FILE    "engines/grim/shaders/emi_actor.fragment"
 shaders/emi_actor.vertex             FILE    "engines/grim/shaders/emi_actor.vertex"
-shaders/emi_actorlights.fragment     FILE    "engines/grim/shaders/emi_actorlights.fragment"
 shaders/emi_actorlights.vertex       FILE    "engines/grim/shaders/emi_actorlights.vertex"
 shaders/emi_background.fragment      FILE    "engines/grim/shaders/emi_background.fragment"
 shaders/emi_background.vertex        FILE    "engines/grim/shaders/emi_background.vertex"
 shaders/emi_dimplane.fragment        FILE    "engines/grim/shaders/emi_dimplane.fragment"
 shaders/emi_dimplane.vertex          FILE    "engines/grim/shaders/emi_dimplane.vertex"
-shaders/emi_sprite.fragment          FILE    "engines/grim/shaders/emi_sprite.fragment"
+shaders/emi_object.fragment          FILE    "engines/grim/shaders/emi_object.fragment"
 shaders/emi_sprite.vertex            FILE    "engines/grim/shaders/emi_sprite.vertex"
-shaders/grim_actor.fragment          FILE    "engines/grim/shaders/grim_actor.fragment"
 shaders/grim_actor.vertex            FILE    "engines/grim/shaders/grim_actor.vertex"
-shaders/grim_actorlights.fragment    FILE    "engines/grim/shaders/grim_actorlights.fragment"
 shaders/grim_actorlights.vertex      FILE    "engines/grim/shaders/grim_actorlights.vertex"
 shaders/grim_background.fragment     FILE    "engines/grim/shaders/grim_background.fragment"
 shaders/grim_background.vertex       FILE    "engines/grim/shaders/grim_background.vertex"
+shaders/grim_object.fragment         FILE    "engines/grim/shaders/grim_object.fragment"
 shaders/grim_primitive.fragment      FILE    "engines/grim/shaders/grim_primitive.fragment"
 shaders/grim_primitive.vertex        FILE    "engines/grim/shaders/grim_primitive.vertex"
 shaders/grim_shadowplane.fragment    FILE    "engines/grim/shaders/grim_shadowplane.fragment"
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index 959b51aa6c2..8b77c922c2e 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -362,17 +362,20 @@ GLuint GfxOpenGLS::nextPrimitive() {
 
 void GfxOpenGLS::setupShaders() {
 	bool isEMI = g_grim->getGameType() == GType_MONKEY4;
+	const Common::String prefix = isEMI ? "emi_" : "grim_";
 
 	static const char* commonAttributes[] = {"position", "texcoord", nullptr};
-	_backgroundProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_background" : "grim_background", commonAttributes);
+	_backgroundProgram = OpenGL::Shader::fromFiles((prefix + "background").c_str(), commonAttributes);
 	_smushProgram = OpenGL::Shader::fromFiles("grim_smush", commonAttributes);
 	_textProgram = OpenGL::Shader::fromFiles("grim_text", commonAttributes);
 	_emergProgram = OpenGL::Shader::fromFiles("grim_emerg", commonAttributes);
 
 	static const char* actorAttributes[] = {"position", "texcoord", "color", "normal", nullptr};
-	_actorProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_actor" : "grim_actor", actorAttributes);
-	_actorLightsProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_actorlights" : "grim_actorlights", actorAttributes);
-	_spriteProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_sprite" : "grim_actor", actorAttributes);
+	// Actors and sprites share one fragment shader per game.
+	const Common::String objectFragment = prefix + "object";
+	_actorProgram = OpenGL::Shader::fromFiles((prefix + "actor").c_str(), objectFragment.c_str(), actorAttributes);
+	_actorLightsProgram = OpenGL::Shader::fromFiles((prefix + "actorlights").c_str(), objectFragment.c_str(), actorAttributes);
+	_spriteProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_sprite" : "grim_actor", objectFragment.c_str(), actorAttributes);
 
 	static const char* primAttributes[] = { "position", nullptr };
 	_shadowPlaneProgram = OpenGL::Shader::fromFiles("grim_shadowplane", primAttributes);
diff --git a/engines/grim/shaders/emi_actorlights.fragment b/engines/grim/shaders/emi_actorlights.fragment
deleted file mode 100644
index fc106bfe212..00000000000
--- a/engines/grim/shaders/emi_actorlights.fragment
+++ /dev/null
@@ -1,20 +0,0 @@
-in vec2 Texcoord;
-in vec4 Color;
-
-uniform sampler2D tex;
-uniform UBOOL textured;
-uniform float alphaRef;
-uniform float meshAlpha;
-
-OUTPUT
-
-void main() {
-	outColor = Color;
-	if (UBOOL_TEST(textured)) {
-		vec4 texColor = texture(tex, Texcoord);
-		outColor.rgba *= texColor.rgba;
-		outColor.a *= meshAlpha;
-		if (outColor.a < alphaRef)
-			discard;
-	}
-}
diff --git a/engines/grim/shaders/emi_actor.fragment b/engines/grim/shaders/emi_object.fragment
similarity index 100%
rename from engines/grim/shaders/emi_actor.fragment
rename to engines/grim/shaders/emi_object.fragment
diff --git a/engines/grim/shaders/emi_sprite.fragment b/engines/grim/shaders/emi_sprite.fragment
deleted file mode 100644
index fc106bfe212..00000000000
--- a/engines/grim/shaders/emi_sprite.fragment
+++ /dev/null
@@ -1,20 +0,0 @@
-in vec2 Texcoord;
-in vec4 Color;
-
-uniform sampler2D tex;
-uniform UBOOL textured;
-uniform float alphaRef;
-uniform float meshAlpha;
-
-OUTPUT
-
-void main() {
-	outColor = Color;
-	if (UBOOL_TEST(textured)) {
-		vec4 texColor = texture(tex, Texcoord);
-		outColor.rgba *= texColor.rgba;
-		outColor.a *= meshAlpha;
-		if (outColor.a < alphaRef)
-			discard;
-	}
-}
diff --git a/engines/grim/shaders/grim_actorlights.fragment b/engines/grim/shaders/grim_actorlights.fragment
deleted file mode 100644
index da120ba5a86..00000000000
--- a/engines/grim/shaders/grim_actorlights.fragment
+++ /dev/null
@@ -1,35 +0,0 @@
-in vec2 Texcoord;
-in vec4 Color;
-
-uniform sampler2D tex;
-uniform sampler2D texZBuf;
-uniform UBOOL textured;
-uniform UBOOL hasZBuffer;
-uniform vec2 texcropZBuf;
-uniform vec2 screenSize;
-uniform float alphaRef;
-
-const float offsetY = 0.0;
-
-OUTPUT
-
-void checkZBuffer() {
-	vec2 zCoord = vec2((gl_FragCoord.x - 0.5) / screenSize.x, 1.0 - (gl_FragCoord.y - offsetY - 0.5) / screenSize.y);
-	vec2 sampled = texture(texZBuf, zCoord * texcropZBuf).ra;
-	float sceneZ = sampled.y + sampled.x / 256.0;
-
-	if (gl_FragCoord.z * 1.0039 > sceneZ)
-		discard;
-}
-
-void main() {
-	if (UBOOL_TEST(hasZBuffer))
-		checkZBuffer();
-	outColor = Color;
-	if (UBOOL_TEST(textured)) {
-		outColor *= texture(tex, Texcoord);
-	}
-
-	if (outColor.a < alphaRef)
-		discard;
-}
diff --git a/engines/grim/shaders/grim_actor.fragment b/engines/grim/shaders/grim_object.fragment
similarity index 100%
rename from engines/grim/shaders/grim_actor.fragment
rename to engines/grim/shaders/grim_object.fragment


Commit: f3d7757d6be080370eecd5b864730427dbb86521
    https://github.com/scummvm/scummvm/commit/f3d7757d6be080370eecd5b864730427dbb86521
Author: Joel Teichroeb (joel at teichroeb.net)
Date: 2026-11-10T19:14:34-05:00

Commit Message:
GRIM: Draw the sprites of Grim in the OpenGL shaders renderer

Grim sprites were drawn with the EMI quad and never showed. They now
have their own vertex shader: a camera-facing quad standing on the
sprite position, with the texture flipped along x.

Assisted-by: Claude:claude-opus-5-5

Changed paths:
  A engines/grim/shaders/grim_sprite.vertex
    devtools/create_project/xcode.cpp
    dists/scummvm.rc
    engines/grim/gfx_opengl_shaders.cpp


diff --git a/devtools/create_project/xcode.cpp b/devtools/create_project/xcode.cpp
index 1918e8472bc..6c6a78f4450 100644
--- a/devtools/create_project/xcode.cpp
+++ b/devtools/create_project/xcode.cpp
@@ -1071,6 +1071,7 @@ XcodeProvider::ValueList& XcodeProvider::getResourceFiles(const BuildSetup &setu
 			files.push_back("engines/grim/shaders/grim_shadowplane.vertex");
 			files.push_back("engines/grim/shaders/grim_smush.fragment");
 			files.push_back("engines/grim/shaders/grim_smush.vertex");
+			files.push_back("engines/grim/shaders/grim_sprite.vertex");
 			files.push_back("engines/grim/shaders/grim_text.fragment");
 			files.push_back("engines/grim/shaders/grim_text.vertex");
 		}
diff --git a/dists/scummvm.rc b/dists/scummvm.rc
index 55855a3dadd..5eb7102ca56 100644
--- a/dists/scummvm.rc
+++ b/dists/scummvm.rc
@@ -71,6 +71,7 @@ shaders/grim_shadowplane.fragment    FILE    "engines/grim/shaders/grim_shadowpl
 shaders/grim_shadowplane.vertex      FILE    "engines/grim/shaders/grim_shadowplane.vertex"
 shaders/grim_smush.fragment          FILE    "engines/grim/shaders/grim_smush.fragment"
 shaders/grim_smush.vertex            FILE    "engines/grim/shaders/grim_smush.vertex"
+shaders/grim_sprite.vertex           FILE    "engines/grim/shaders/grim_sprite.vertex"
 shaders/grim_text.fragment           FILE    "engines/grim/shaders/grim_text.fragment"
 shaders/grim_text.vertex             FILE    "engines/grim/shaders/grim_text.vertex"
 #endif
diff --git a/engines/grim/gfx_opengl_shaders.cpp b/engines/grim/gfx_opengl_shaders.cpp
index 8b77c922c2e..2bd508540b0 100644
--- a/engines/grim/gfx_opengl_shaders.cpp
+++ b/engines/grim/gfx_opengl_shaders.cpp
@@ -375,7 +375,7 @@ void GfxOpenGLS::setupShaders() {
 	const Common::String objectFragment = prefix + "object";
 	_actorProgram = OpenGL::Shader::fromFiles((prefix + "actor").c_str(), objectFragment.c_str(), actorAttributes);
 	_actorLightsProgram = OpenGL::Shader::fromFiles((prefix + "actorlights").c_str(), objectFragment.c_str(), actorAttributes);
-	_spriteProgram = OpenGL::Shader::fromFiles(isEMI ? "emi_sprite" : "grim_actor", objectFragment.c_str(), actorAttributes);
+	_spriteProgram = OpenGL::Shader::fromFiles((prefix + "sprite").c_str(), objectFragment.c_str(), actorAttributes);
 
 	static const char* primAttributes[] = { "position", nullptr };
 	_shadowPlaneProgram = OpenGL::Shader::fromFiles("grim_shadowplane", primAttributes);
@@ -1135,6 +1135,50 @@ void GfxOpenGLS::drawModelFace(const Mesh *mesh, const MeshFace *face) {
 }
 
 void GfxOpenGLS::drawSprite(const Sprite *sprite) {
+	if (g_grim->getGameType() == GType_GRIM) {
+		// A sprite of Grim (the smoke of Manny's cigarette, sparks) is a quad that faces the camera, its bottom edge on the position of the sprite, and the
+		// texture runs flipped along x, as in the fixed pipeline.
+		// The sprite writes depth, as in the fixed pipeline: the meshes of the model are drawn after the sprites of their node (Manny's head after
+		// the smoke of his cigarette) and must not cover them. The alpha test keeps the clear texels from writing depth.
+		glDepthMask(GL_TRUE);
+		glEnable(GL_BLEND);
+		if (sprite->_flags1 & Sprite::BlendAdditive) {
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE);
+		} else {
+			glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		}
+		if (sprite->_flags2 & Sprite::DepthTest) {
+			glEnable(GL_DEPTH_TEST);
+		} else {
+			glDisable(GL_DEPTH_TEST);
+		}
+
+		_spriteProgram->use();
+		_spriteProgram->setUniform("extraMatrix", _matrixStack.top());
+		_spriteProgram->setUniform("spritePos", sprite->_pos);
+		_spriteProgram->setUniform("spriteSize", Math::Vector2d(sprite->_width, sprite->_height));
+		_spriteProgram->setUniform("textured", GL_TRUE);
+		_spriteProgram->setUniform1f("alphaRef", 0.5f);
+
+		float sprite_quad[] = {
+		//	 X   ,  Y  , Z   , S   , T
+			+0.5f, 0.0f, 0.0f, 0.0f, 1.0f,
+			+0.5f, 1.0f, 0.0f, 0.0f, 0.0f,
+			-0.5f, 1.0f, 0.0f, 1.0f, 0.0f,
+			-0.5f, 0.0f, 0.0f, 1.0f, 1.0f,
+		};
+
+		glBindBuffer(GL_ARRAY_BUFFER, _spriteVBO);
+		glBufferData(GL_ARRAY_BUFFER, sizeof(sprite_quad), sprite_quad, GL_STATIC_DRAW);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, _quadEBO);
+		glDrawElements(GL_TRIANGLES, 6, GL_UNSIGNED_SHORT, nullptr);
+		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
+		glEnable(GL_DEPTH_TEST);
+		glDepthMask(GL_TRUE);
+		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
+		return;
+	}
+
 	if (g_grim->getGameType() == GType_MONKEY4) {
 		glDepthMask(GL_TRUE);
 	} else {
diff --git a/engines/grim/shaders/grim_sprite.vertex b/engines/grim/shaders/grim_sprite.vertex
new file mode 100644
index 00000000000..b9d800f4136
--- /dev/null
+++ b/engines/grim/shaders/grim_sprite.vertex
@@ -0,0 +1,42 @@
+in vec3 position;
+in vec2 texcoord;
+in vec4 color;
+
+uniform highp mat4 modelMatrix;
+uniform highp mat4 viewMatrix;
+uniform highp mat4 projMatrix;
+// the node of the model that the sprite hangs on, and the place of the sprite in it
+uniform highp mat4 extraMatrix;
+uniform highp vec3 spritePos;
+uniform highp vec2 spriteSize;
+
+struct shadow_info {
+	UBOOL _active;
+	vec3 _color;
+	vec3 _light;
+	vec3 _point;
+	vec3 _normal;
+};
+
+uniform shadow_info shadow;
+
+out vec2 Texcoord;
+out vec4 Color;
+out float ClipDist;
+
+// A sprite of Grim is a quad that always faces the camera (smoke, sparks): its bottom edge stands on the position of the sprite and the corners
+// are put around that point in the plane of the view.
+void main() {
+	vec4 anchor = modelMatrix * extraMatrix * vec4(spritePos, 1.0);
+	vec4 viewPos = viewMatrix * anchor;
+	viewPos.xy += position.xy * spriteSize;
+	gl_Position = projMatrix * viewPos;
+
+	ClipDist = 1.0;
+	if (UBOOL_TEST(shadow._active)) {
+		Color = vec4(shadow._color, 1.0);
+	} else {
+		Color = color;
+	}
+	Texcoord = texcoord;
+}




More information about the Scummvm-git-logs mailing list