From 703a51e4c06b4177a23a36861ace2516b8b5b1bf Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:33:56 -0500
Subject: [Android] Start of *working* GLES3 support. Needs to be able to
 compile in Windows still.

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 2df1f47760..4588317ab8 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -3,6 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "ProgramShaderCache.h"
+#include "DriverDetails"
 #include "MathUtil.h"
 #include "StreamBuffer.h"
 #include "Debugger.h"
@@ -532,15 +533,15 @@ void ProgramShaderCache::CreateHeader ( void )
 		"%s\n"
 		"%s\n"
 		"#define COLOROUT(name) %s\n"
-		
+				
 		, v==GLSLES3 ? "300 es" : v==GLSL_120 ? "120" : v==GLSL_130 ? "130" : "140"
 		, v==GLSLES3 ? "precision highp float;" : ""
 		, v==GLSLES3 ? "" : v<=GLSL_130 ? "#extension GL_ARB_texture_rectangle : enable" : "#define texture2DRect texture"
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
-		, v==GLSL_120 ? "varying" : "centroid in"
-		, v==GLSL_120 ? "varying" : "centroid out"
+		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
+		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
 		, v==GLSL_120 ? "#define texture texture2D" : ""
 		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
 		, v==GLSL_120 ? "#define out " : ""
-- 
cgit v1.2.3


From 9df3dbe13c6fd12f060b28b500cba3d6467ee1c7 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:38:45 -0500
Subject: Build Fix

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index 4588317ab8..d07dbb6246 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -540,8 +540,8 @@ void ProgramShaderCache::CreateHeader ( void )
 		, g_ActiveConfig.backend_info.bSupportsGLSLUBO && v<GLSL_140 ? "#extension GL_ARB_uniform_buffer_object : enable" : ""
 		, v==GLSL_120 ? "attribute" : "in"
 		, v==GLSL_120 ? "attribute" : "out"
-		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
-		, DriverDetails::HasBug(BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "in" : v==GLSL_120 ? "varying" : "centroid in"
+		, DriverDetails::HasBug(DriverDetails::BUG_BROKENCENTROID) ? "out" : v==GLSL_120 ? "varying" : "centroid out"
 		, v==GLSL_120 ? "#define texture texture2D" : ""
 		, v==GLSL_120 ? "#define round(x) floor((x)+0.5f)" : ""
 		, v==GLSL_120 ? "#define out " : ""
-- 
cgit v1.2.3


From ab6151a5ba9583b94bdd0cb47c4dbada4c96e315 Mon Sep 17 00:00:00 2001
From: Ryan Houdek <Sonicadvance1@gmail.com>
Date: Tue, 11 Jun 2013 08:41:30 -0500
Subject: Build Fix 2x

---
 Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp')

diff --git a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
index d07dbb6246..90cf401687 100644
--- a/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
+++ b/Source/Plugins/Plugin_VideoOGL/Src/ProgramShaderCache.cpp
@@ -3,7 +3,7 @@
 // Refer to the license.txt file included.
 
 #include "ProgramShaderCache.h"
-#include "DriverDetails"
+#include "DriverDetails.h"
 #include "MathUtil.h"
 #include "StreamBuffer.h"
 #include "Debugger.h"
-- 
cgit v1.2.3