diff --git a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
index cd7ecd3461..e88a8ca11f 100644
--- a/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/PixelShaderGen.cpp
@@ -516,6 +516,14 @@ const char* WriteBinding(API_TYPE ApiType, const u32 num)
 	sprintf(result, "layout(binding = %d) ", num);
 	return result;
 }
+const char *WriteLocation(API_TYPE ApiType)
+{
+	static char result[64];
+	if(ApiType == API_GLSL && g_ActiveConfig.backend_info.bSupportsGLSLUBO)
+		return "";
+	sprintf(result, "uniform ");
+	return result;
+}
 
 const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType, u32 components)
 {
@@ -605,18 +613,18 @@ const char *GeneratePixelShaderCode(DSTALPHA_MODE dstAlphaMode, API_TYPE ApiType
 	if(ApiType == API_GLSL && g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		WRITE(p, "layout(std140, binding = 0) uniform PSBlock {\n");
 		
-		WRITE(p, "uniform float4 "I_COLORS"[4] %s;\n", WriteRegister(ApiType, "c", C_COLORS));
-		WRITE(p, "uniform float4 "I_KCOLORS"[4] %s;\n", WriteRegister(ApiType, "c", C_KCOLORS));
-		WRITE(p, "uniform float4 "I_ALPHA"[1] %s;\n", WriteRegister(ApiType, "c", C_ALPHA));
-		WRITE(p, "uniform float4 "I_TEXDIMS"[8] %s;\n",  WriteRegister(ApiType, "c", C_TEXDIMS));
-		WRITE(p, "uniform float4 "I_ZBIAS"[2] %s;\n", WriteRegister(ApiType, "c", C_ZBIAS));
-		WRITE(p, "uniform float4 "I_INDTEXSCALE"[2] %s;\n",  WriteRegister(ApiType, "c", C_INDTEXSCALE));
-		WRITE(p, "uniform float4 "I_INDTEXMTX"[6] %s;\n", WriteRegister(ApiType, "c", C_INDTEXMTX));
-		WRITE(p, "uniform float4 "I_FOG"[3] %s;\n", WriteRegister(ApiType, "c", C_FOG));
+		WRITE(p, "%sfloat4 "I_COLORS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_COLORS));
+		WRITE(p, "%sfloat4 "I_KCOLORS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_KCOLORS));
+		WRITE(p, "%sfloat4 "I_ALPHA"[1] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_ALPHA));
+		WRITE(p, "%sfloat4 "I_TEXDIMS"[8] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_TEXDIMS));
+		WRITE(p, "%sfloat4 "I_ZBIAS"[2] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_ZBIAS));
+		WRITE(p, "%sfloat4 "I_INDTEXSCALE"[2] %s;\n", WriteLocation(ApiType),  WriteRegister(ApiType, "c", C_INDTEXSCALE));
+		WRITE(p, "%sfloat4 "I_INDTEXMTX"[6] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_INDTEXMTX));
+		WRITE(p, "%sfloat4 "I_FOG"[3] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_FOG));
 		
 		// Compiler will optimize these out by itself.
-		WRITE(p, "uniform float4 "I_PLIGHTS"[40] %s;\n", WriteRegister(ApiType, "c", C_PLIGHTS));
-		WRITE(p, "uniform float4 "I_PMATERIALS"[4] %s;\n", WriteRegister(ApiType, "c", C_PMATERIALS));
+		WRITE(p, "%sfloat4 "I_PLIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PLIGHTS));
+		WRITE(p, "%sfloat4 "I_PMATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PMATERIALS));
 		
 	if(ApiType == API_GLSL && g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		WRITE(p, "};\n");
diff --git a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
index 770208552b..c04a2ba1f1 100644
--- a/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
+++ b/Source/Core/VideoCommon/Src/VertexShaderGen.cpp
@@ -165,6 +165,7 @@ char* GenerateVSOutputStruct(char* p, u32 components, API_TYPE ApiType)
 
 extern const char* WriteRegister(API_TYPE ApiType, const char *prefix, const u32 num);
 extern const char* WriteBinding(API_TYPE ApiType, const u32 num);
+const char *WriteLocation(API_TYPE ApiType);
 
 const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 {
@@ -218,15 +219,15 @@ const char *GenerateVertexShaderCode(u32 components, API_TYPE ApiType)
 	if(ApiType == API_GLSL && g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		WRITE(p, "layout(std140, binding = 1) uniform VSBlock {\n");
 		
-		WRITE(p, "uniform float4 "I_POSNORMALMATRIX"[6] %s;\n", WriteRegister(ApiType, "c", C_POSNORMALMATRIX));
-		WRITE(p, "uniform float4 "I_PROJECTION"[4] %s;\n", WriteRegister(ApiType, "c", C_PROJECTION));
-		WRITE(p, "uniform float4 "I_MATERIALS"[4] %s;\n", WriteRegister(ApiType, "c", C_MATERIALS));
-		WRITE(p, "uniform float4 "I_LIGHTS"[40] %s;\n", WriteRegister(ApiType, "c", C_LIGHTS));
-		WRITE(p, "uniform float4 "I_TEXMATRICES"[24] %s;\n", WriteRegister(ApiType, "c", C_TEXMATRICES)); // also using tex matrices
-		WRITE(p, "uniform float4 "I_TRANSFORMMATRICES"[64] %s;\n", WriteRegister(ApiType, "c", C_TRANSFORMMATRICES));
-		WRITE(p, "uniform float4 "I_NORMALMATRICES"[32] %s;\n", WriteRegister(ApiType, "c", C_NORMALMATRICES));
-		WRITE(p, "uniform float4 "I_POSTTRANSFORMMATRICES"[64] %s;\n", WriteRegister(ApiType, "c", C_POSTTRANSFORMMATRICES));
-		WRITE(p, "uniform float4 "I_DEPTHPARAMS" %s;\n", WriteRegister(ApiType, "c", C_DEPTHPARAMS));
+		WRITE(p, "%sfloat4 "I_POSNORMALMATRIX"[6] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_POSNORMALMATRIX));
+		WRITE(p, "%sfloat4 "I_PROJECTION"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_PROJECTION));
+		WRITE(p, "%sfloat4 "I_MATERIALS"[4] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_MATERIALS));
+		WRITE(p, "%sfloat4 "I_LIGHTS"[40] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_LIGHTS));
+		WRITE(p, "%sfloat4 "I_TEXMATRICES"[24] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_TEXMATRICES)); // also using tex matrices
+		WRITE(p, "%sfloat4 "I_TRANSFORMMATRICES"[64] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_TRANSFORMMATRICES));
+		WRITE(p, "%sfloat4 "I_NORMALMATRICES"[32] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_NORMALMATRICES));
+		WRITE(p, "%sfloat4 "I_POSTTRANSFORMMATRICES"[64] %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_POSTTRANSFORMMATRICES));
+		WRITE(p, "%sfloat4 "I_DEPTHPARAMS" %s;\n", WriteLocation(ApiType), WriteRegister(ApiType, "c", C_DEPTHPARAMS));
 		
 	if(ApiType == API_GLSL && g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 		WRITE(p, "};\n");
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
index 7e18e54c7b..50382cc0dd 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/PixelShaderCache.cpp
@@ -503,7 +503,7 @@ void SetGLSLPSConstant4f(unsigned int const_number, float f1, float f2, float f3
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(0, const_number, f);
-		return;
+		//return;
 	}
     for (unsigned int a = 0; a < 10; ++a)
     {
@@ -521,7 +521,7 @@ void SetGLSLPSConstant4fv(unsigned int const_number, const float *f)
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(0, const_number, f);
-		return;
+		//return;
 	}
     for (unsigned int a = 0; a < 10; ++a)
     {
@@ -539,7 +539,7 @@ void SetMultiGLSLPSConstant4fv(unsigned int const_number, unsigned int count, co
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(0, const_number, f, count);
-		return;
+		//return;
 	}
     for (unsigned int a = 0; a < 10; ++a)
     {
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index c7c8624069..9fd3479e1d 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -94,7 +94,6 @@ namespace OGL
                 glLinkProgram(entry.program.glprogid);
                 
                 glUseProgram(entry.program.glprogid);
-
 		
                 // We cache our uniform locations for now
                 // Once we move up to a newer version of GLSL, ~1.30
diff --git a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
index d0fb9ec189..e22a2f3be2 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/VertexShaderCache.cpp
@@ -250,7 +250,7 @@ void SetGLSLVSConstant4f(unsigned int const_number, float f1, float f2, float f3
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(1, const_number, buf);
-		return;
+		//return;
 	}
     for( unsigned int a = 0; a < 9; ++a)
     {
@@ -268,7 +268,7 @@ void SetGLSLVSConstant4fv(unsigned int const_number, const float *f)
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(1, const_number, f);
-		return;
+		//return;
 	}
     for( unsigned int a = 0; a < 9; ++a)
     {
@@ -286,7 +286,7 @@ void SetMultiGLSLVSConstant4fv(unsigned int const_number, unsigned int count, co
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(1, const_number, f, count);
-		return;
+		//return;
 	}
     for( unsigned int a = 0; a < 9; ++a)
     {
@@ -312,7 +312,7 @@ void SetMultiGLSLVSConstant3fv(unsigned int const_number, unsigned int count, co
 	if (g_ActiveConfig.backend_info.bSupportsGLSLUBO)
 	{
 		ProgramShaderCache::SetUniformObjects(1, const_number, buf, count);
-		return;
+		//return;
 	}
     for( unsigned int a = 0; a < 9; ++a)
     {