summaryrefslogtreecommitdiff
path: root/Source/Core/VideoBackends
diff options
context:
space:
mode:
authorTony Wasserka <neobrainx@gmail.com>2014-05-01 10:52:18 +0200
committerTony Wasserka <neobrainx@gmail.com>2014-05-01 10:52:18 +0200
commit2cf8f55ad35da2344dabb72ec0683988ddc52ef5 (patch)
tree3dd292db992e652ba7d8974360f9fa28149fcec7 /Source/Core/VideoBackends
parentc5d506142f9259c7e31c60b3acebe0738d1001fb (diff)
parent2d8cfb89d777ac36d3dcca8976caa2f7804ab43c (diff)
Merge pull request #310 from Sonicadvance1/Integer-posmtx
Change over to use integer posmtx in our vertex shaders
Diffstat (limited to 'Source/Core/VideoBackends')
-rw-r--r--Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp1
-rw-r--r--Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp2
2 files changed, 2 insertions, 1 deletions
diff --git a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
index 7c6bb7aeff..f6fd98a48a 100644
--- a/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
+++ b/Source/Core/VideoBackends/OGL/GLExtensions/GLExtensions.cpp
@@ -1604,6 +1604,7 @@ namespace GLExtensions
"GL_ARB_sync",
"GL_ARB_ES2_compatibility",
"VERSION_GLES3",
+ "VERSION_3_0",
};
for (auto it : gles3exts)
m_extension_list[it] = true;
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
index 7cf40eed34..90b86194e1 100644
--- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
+++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp
@@ -102,7 +102,7 @@ void SHADER::SetProgramBindings()
// Need to set some attribute locations
glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos");
- glBindAttribLocation(glprogid, SHADER_POSMTX_ATTRIB, "fposmtx");
+ glBindAttribLocation(glprogid, SHADER_POSMTX_ATTRIB, "posmtx");
glBindAttribLocation(glprogid, SHADER_COLOR0_ATTRIB, "color0");
glBindAttribLocation(glprogid, SHADER_COLOR1_ATTRIB, "color1");