diff options
| author | Ryan Houdek <Sonicadvance1@gmail.com> | 2013-12-30 07:22:50 -0600 |
|---|---|---|
| committer | degasus <wickmarkus@web.de> | 2014-01-17 15:50:51 +0100 |
| commit | 71681de81a79c6508f44dfc949026ec2f51943ae (patch) | |
| tree | d5f83f2100fbcd5891a36dbed97c4469be301b13 /Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | |
| parent | 770485ad04185c93ea18b8bf86e56569d1fb8f37 (diff) | |
[GLExtensions] Initial code drop for GLExtensions. This drops GLEW entirely from the codebase. This has been tested on Android and Linux+ATI. Of course untested on Windows and Apple. Also untested with Linux + EGL but should be fine there. There are most likely a couple of extensions I'm missing which would result in null pointer runs but not bad for the initial commit.
Conflicts:
CMakeLists.txt
Externals/GLew/glew.vcxproj
Externals/GLew/glew.vcxproj.filters
Source/Core/VideoBackends/OGL/CMakeLists.txt
Source/Core/VideoBackends/OGL/GLFunctions.cpp
Source/Core/VideoBackends/OGL/GLFunctions.h
Source/Core/VideoBackends/OGL/GLUtil.h
Source/Core/VideoBackends/OGL/Render.cpp
Source/VSProps/Base.props
Diffstat (limited to 'Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp index e81c6d2d84..51b6e05063 100644 --- a/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp +++ b/Source/Core/VideoBackends/OGL/ProgramShaderCache.cpp @@ -156,10 +156,8 @@ void SHADER::SetProgramBindings() // So we do support extended blending // So we need to set a few more things here. // Bind our out locations -#ifndef USE_GLES3 glBindFragDataLocationIndexed(glprogid, 0, 0, "ocol0"); glBindFragDataLocationIndexed(glprogid, 0, 1, "ocol1"); -#endif } // Need to set some attribute locations glBindAttribLocation(glprogid, SHADER_POSITION_ATTRIB, "rawpos"); |