GRIM: Rename shaders files to be unique per engine

dists/residualvm.rc

@@ -113,48 +113,48 @@ pred.dic               FILE    "dists/pred.dic"
 // ResidualVM specific START
 #ifdef USE_OPENGL_SHADERS
 #if PLUGIN_ENABLED_STATIC(GRIM)
-shaders/dim.fragment             FILE    "engines/grim/shaders/dim.fragment"
-shaders/dim.vertex               FILE    "engines/grim/shaders/dim.vertex"
-shaders/emerg.fragment           FILE    "engines/grim/shaders/emerg.fragment"
-shaders/emerg.vertex             FILE    "engines/grim/shaders/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_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/grim_actor.fragment      FILE    "engines/grim/shaders/grim_actor.fragment"
-shaders/grim_actor.vertex        FILE    "engines/grim/shaders/grim_actor.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_primitive.fragment  FILE    "engines/grim/shaders/grim_primitive.fragment"
-shaders/grim_primitive.vertex    FILE    "engines/grim/shaders/grim_primitive.vertex"
-shaders/shadowplane.fragment     FILE    "engines/grim/shaders/shadowplane.fragment"
-shaders/shadowplane.vertex       FILE    "engines/grim/shaders/shadowplane.vertex"
-shaders/smush.fragment           FILE    "engines/grim/shaders/smush.fragment"
-shaders/smush.vertex             FILE    "engines/grim/shaders/smush.vertex"
-shaders/text.fragment            FILE    "engines/grim/shaders/text.fragment"
-shaders/text.vertex              FILE    "engines/grim/shaders/text.vertex"
+shaders/grim_dim.fragment            FILE    "engines/grim/shaders/grim_dim.fragment"
+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_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/grim_actor.fragment          FILE    "engines/grim/shaders/grim_actor.fragment"
+shaders/grim_actor.vertex            FILE    "engines/grim/shaders/grim_actor.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_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"
+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_text.fragment           FILE    "engines/grim/shaders/grim_text.fragment"
+shaders/grim_text.vertex             FILE    "engines/grim/shaders/grim_text.vertex"
 #endif
 #if PLUGIN_ENABLED_STATIC(MYST3)
-shaders/myst3_box.fragment       FILE    "engines/myst3/shaders/myst3_box.fragment"
-shaders/myst3_box.vertex         FILE    "engines/myst3/shaders/myst3_box.vertex"
-shaders/myst3_cube.fragment      FILE    "engines/myst3/shaders/myst3_cube.fragment"
-shaders/myst3_cube.vertex        FILE    "engines/myst3/shaders/myst3_cube.vertex"
-shaders/myst3_text.fragment      FILE    "engines/myst3/shaders/myst3_text.fragment"
-shaders/myst3_text.vertex        FILE    "engines/myst3/shaders/myst3_text.vertex"
+shaders/myst3_box.fragment           FILE    "engines/myst3/shaders/myst3_box.fragment"
+shaders/myst3_box.vertex             FILE    "engines/myst3/shaders/myst3_box.vertex"
+shaders/myst3_cube.fragment          FILE    "engines/myst3/shaders/myst3_cube.fragment"
+shaders/myst3_cube.vertex            FILE    "engines/myst3/shaders/myst3_cube.vertex"
+shaders/myst3_text.fragment          FILE    "engines/myst3/shaders/myst3_text.fragment"
+shaders/myst3_text.vertex            FILE    "engines/myst3/shaders/myst3_text.vertex"
 #endif
 #if PLUGIN_ENABLED_STATIC(STARK)
-shaders/stark_actor.fragment     FILE    "engines/stark/shaders/stark_actor.fragment"
-shaders/stark_actor.vertex       FILE    "engines/stark/shaders/stark_actor.vertex"
-shaders/stark_prop.fragment      FILE    "engines/stark/shaders/stark_prop.fragment"
-shaders/stark_prop.vertex        FILE    "engines/stark/shaders/stark_prop.vertex"
-shaders/stark_surface.fragment   FILE    "engines/stark/shaders/stark_surface.fragment"
-shaders/stark_surface.vertex     FILE    "engines/stark/shaders/stark_surface.vertex"
-shaders/stark_fade.fragment      FILE    "engines/stark/shaders/stark_fade.fragment"
-shaders/stark_fade.vertex        FILE    "engines/stark/shaders/stark_fade.vertex"
-shaders/stark_shadow.fragment    FILE    "engines/stark/shaders/stark_shadow.fragment"
-shaders/stark_shadow.vertex      FILE    "engines/stark/shaders/stark_shadow.vertex"
+shaders/stark_actor.fragment         FILE    "engines/stark/shaders/stark_actor.fragment"
+shaders/stark_actor.vertex           FILE    "engines/stark/shaders/stark_actor.vertex"
+shaders/stark_prop.fragment          FILE    "engines/stark/shaders/stark_prop.fragment"
+shaders/stark_prop.vertex            FILE    "engines/stark/shaders/stark_prop.vertex"
+shaders/stark_surface.fragment       FILE    "engines/stark/shaders/stark_surface.fragment"
+shaders/stark_surface.vertex         FILE    "engines/stark/shaders/stark_surface.vertex"
+shaders/stark_fade.fragment          FILE    "engines/stark/shaders/stark_fade.fragment"
+shaders/stark_fade.vertex            FILE    "engines/stark/shaders/stark_fade.vertex"
+shaders/stark_shadow.fragment        FILE    "engines/stark/shaders/stark_shadow.fragment"
+shaders/stark_shadow.vertex          FILE    "engines/stark/shaders/stark_shadow.vertex"
 #endif
 #if PLUGIN_ENABLED_STATIC(WINTERMUTE)
 shaders/wme_fade.fragment            FILE    "engines/wintermute/base/gfx/opengl/shaders/wme_fade.fragment"

engines/grim/gfx_opengl_shaders.cpp

@@ -375,22 +375,22 @@ void GfxOpenGLS::setupShaders() {
 
 	static const char* commonAttributes[] = {"position", "texcoord", NULL};
 	_backgroundProgram = OpenGL::ShaderGL::fromFiles(isEMI ? "emi_background" : "grim_background", commonAttributes);
-	_smushProgram = OpenGL::ShaderGL::fromFiles("smush", commonAttributes);
-	_textProgram = OpenGL::ShaderGL::fromFiles("text", commonAttributes);
-	_emergProgram = OpenGL::ShaderGL::fromFiles("emerg", commonAttributes);
+	_smushProgram = OpenGL::ShaderGL::fromFiles("grim_smush", commonAttributes);
+	_textProgram = OpenGL::ShaderGL::fromFiles("grim_text", commonAttributes);
+	_emergProgram = OpenGL::ShaderGL::fromFiles("grim_emerg", commonAttributes);
 
 	static const char* actorAttributes[] = {"position", "texcoord", "color", "normal", NULL};
 	_actorProgram = OpenGL::ShaderGL::fromFiles(isEMI ? "emi_actor" : "grim_actor", actorAttributes);
 	_spriteProgram = OpenGL::ShaderGL::fromFiles(isEMI ? "emi_actor" : "grim_actor", actorAttributes);
 
 	static const char* primAttributes[] = { "position", NULL };
-	_shadowPlaneProgram = OpenGL::ShaderGL::fromFiles("shadowplane", primAttributes);
+	_shadowPlaneProgram = OpenGL::ShaderGL::fromFiles("grim_shadowplane", primAttributes);
 	_primitiveProgram = OpenGL::ShaderGL::fromFiles("grim_primitive", primAttributes);
 
 	if (!isEMI) {
 		_irisProgram = _primitiveProgram->clone();
 
-		_dimProgram = OpenGL::ShaderGL::fromFiles("dim", commonAttributes);
+		_dimProgram = OpenGL::ShaderGL::fromFiles("grim_dim", commonAttributes);
 		_dimRegionProgram = _dimProgram->clone();
 	} else {
 		_dimPlaneProgram = OpenGL::ShaderGL::fromFiles("emi_dimplane", primAttributes);