remove more obsolete code

love2d · Jun 22, 2024 · f548430 · f548430
1 parent 46402d4
commit f548430
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/src/modules/graphics/Shader.cpp b/src/modules/graphics/Shader.cpp
@@ -1678,12 +1678,11 @@ static StringMap<Shader::Language, Shader::LANGUAGE_MAX_ENUM> languages(language
 
 static StringMap<Shader::BuiltinUniform, Shader::BUILTIN_MAX_ENUM>::Entry builtinNameEntries[] =
 {
-	{ "MainTex",               Shader::BUILTIN_TEXTURE_MAIN        },
-	{ "love_VideoYChannel",    Shader::BUILTIN_TEXTURE_VIDEO_Y     },
-	{ "love_VideoCbChannel",   Shader::BUILTIN_TEXTURE_VIDEO_CB    },
-	{ "love_VideoCrChannel",   Shader::BUILTIN_TEXTURE_VIDEO_CR    },
-	{ "love_UniformsPerDraw",  Shader::BUILTIN_UNIFORMS_PER_DRAW   },
-	{ "love_UniformsPerDraw2", Shader::BUILTIN_UNIFORMS_PER_DRAW_2 },
+	{ "MainTex",               Shader::BUILTIN_TEXTURE_MAIN      },
+	{ "love_VideoYChannel",    Shader::BUILTIN_TEXTURE_VIDEO_Y   },
+	{ "love_VideoCbChannel",   Shader::BUILTIN_TEXTURE_VIDEO_CB  },
+	{ "love_VideoCrChannel",   Shader::BUILTIN_TEXTURE_VIDEO_CR  },
+	{ "love_UniformsPerDraw",  Shader::BUILTIN_UNIFORMS_PER_DRAW },
 };
 
 static StringMap<Shader::BuiltinUniform, Shader::BUILTIN_MAX_ENUM> builtinNames(builtinNameEntries, sizeof(builtinNameEntries));

diff --git a/src/modules/graphics/Shader.h b/src/modules/graphics/Shader.h
@@ -64,7 +64,6 @@ class Shader : public Object, public Resource
 		BUILTIN_TEXTURE_VIDEO_CB,
 		BUILTIN_TEXTURE_VIDEO_CR,
 		BUILTIN_UNIFORMS_PER_DRAW,
-		BUILTIN_UNIFORMS_PER_DRAW_2,
 		BUILTIN_MAX_ENUM
 	};
 
@@ -188,8 +187,6 @@ class Shader : public Object, public Resource
 		Vector4 scaleParams;
 		Vector4 clipSpaceParams;
  		Colorf constantColor;
-
-		// Pixel shader-centric variables past this point.
 		Vector4 screenSizeParams;
  	};