merge glsl headers into one place

3 files changed, 0 insertions, 62 deletions

diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index d7017a7e0a..6a4d384ba6 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -528,24 +528,6 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 
 	if (ApiType == API_OPENGL)
 	{
-		// A few required defines and ones that will make our lives a lot easier
-		WRITE(p, "#version 130\n");
-		if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-			WRITE(p, "#extension GL_ARB_uniform_buffer_object : enable\n");
-		WRITE(p, "#define ATTRIN in\n");
-		WRITE(p, "#define ATTROUT out\n");
-		WRITE(p, "#define VARYIN in\n");
-		WRITE(p, "#define VARYOUT out\n");
-
-		// Silly differences
-		WRITE(p, "#define float2 vec2\n");
-		WRITE(p, "#define float3 vec3\n");
-		WRITE(p, "#define float4 vec4\n");
-
-		// cg to glsl function translation
-		WRITE(p, "#define frac(x) fract(x)\n");
-		WRITE(p, "#define saturate(x) clamp(x, 0.0f, 1.0f)\n");
-		WRITE(p, "#define lerp(x, y, z) mix(x, y, z)\n");
 
 		// A function here
 		// Fmod implementation gleaned from Nvidia
diff --git a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
index 3dbb3aaa38..b20b6aeea0 100644
--- a/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
+++ b/Source/Core/VideoCommon/Src/TextureConversionShader.cpp
@@ -822,27 +822,6 @@ const char *GenerateEncodingShader(u32 format,API_TYPE ApiType)
 
 	char *p = text;
 
-	if (ApiType == API_OPENGL)
-	{
-		// A few required defines and ones that will make our lives a lot easier
-		WRITE(p, "#version 130\n");
-		if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-			WRITE(p, "#extension GL_ARB_uniform_buffer_object : enable\n");
-		
-		// Silly differences
-		WRITE(p, "#define float2 vec2\n");
-		WRITE(p, "#define float3 vec3\n");
-		WRITE(p, "#define float4 vec4\n");
-
-		// cg to glsl function translation
-		WRITE(p, "#define frac(x) fract(x)\n");
-		WRITE(p, "#define saturate(x) clamp(x, 0.0f, 1.0f)\n");
-		WRITE(p, "#define lerp(x, y, z) mix(x, y, z)\n");
-
-		// We require this here
-		WRITE(p, "#ifdef GL_ARB_texture_rectangle\n     #extension GL_ARB_texture_rectangle : require\n#endif\n");
-	}
-
 	switch (format)
 	{
 	case GX_TF_I4:
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 42b63f0929..a84d680855 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -184,29 +184,6 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 	char *p = text;
 	WRITE(p, "//Vertex Shader: comp:%x, \n", components);
 	
-	if (ApiType == API_OPENGL)
-	{
-		// A few required defines and ones that will make our lives a lot easier
-		
-		WRITE(p, "#version 130\n");
-		if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
-			WRITE(p, "#extension GL_ARB_uniform_buffer_object : enable\n");
-		WRITE(p, "#define ATTRIN in\n");
-		WRITE(p, "#define ATTROUT out\n");
-		WRITE(p, "#define VARYIN in\n");
-		WRITE(p, "#define VARYOUT out\n");
-		
-		// Silly differences
-		WRITE(p, "#define float2 vec2\n");
-		WRITE(p, "#define float3 vec3\n");
-		WRITE(p, "#define float4 vec4\n");
-
-		// cg to glsl function translation
-		WRITE(p, "#define frac(x) fract(x)\n");
-		WRITE(p, "#define saturate(x) clamp(x, 0.0f, 1.0f)\n");
-		WRITE(p, "#define lerp(x, y, z) mix(x, y, z)\n");
-	}
-	
 	// uniforms
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		WRITE(p, "layout(std140) uniform VSBlock {\n");