diff options
| author | flacs <tilkax@gmail.com> | 2015-05-28 10:17:57 +0200 |
|---|---|---|
| committer | flacs <tilkax@gmail.com> | 2015-05-28 10:17:57 +0200 |
| commit | 6ff3fcee597663066c966a54ee51aab7fa166cd9 (patch) | |
| tree | 7db90308460310477651ce9acab37436f7bbb9eb /Source/Core/VideoBackends/OGL/TextureConverter.cpp | |
| parent | a26cf63783df47b6f70e9ff9987e1a37c92a2e38 (diff) | |
| parent | 285ac34bf3bada1737dd1e0a2f30af575435828e (diff) | |
Merge pull request #2469 from Tilka/ogl
OGL: use GL_TEXTURE* constants
Diffstat (limited to 'Source/Core/VideoBackends/OGL/TextureConverter.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/OGL/TextureConverter.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/OGL/TextureConverter.cpp b/Source/Core/VideoBackends/OGL/TextureConverter.cpp index 9e4ac46e68..62c74e7b95 100644 --- a/Source/Core/VideoBackends/OGL/TextureConverter.cpp +++ b/Source/Core/VideoBackends/OGL/TextureConverter.cpp @@ -172,7 +172,7 @@ void Init() { glGenFramebuffers(2, s_texConvFrameBuffer); - glActiveTexture(GL_TEXTURE0 + 9); + glActiveTexture(GL_TEXTURE9); glGenTextures(1, &s_srcTexture); glBindTexture(GL_TEXTURE_2D, s_srcTexture); glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, 0); @@ -225,7 +225,7 @@ static void EncodeToRamUsingShader(GLuint srcTexture, OpenGL_BindAttributelessVAO(); // set source texture - glActiveTexture(GL_TEXTURE0+9); + glActiveTexture(GL_TEXTURE9); glBindTexture(GL_TEXTURE_2D_ARRAY, srcTexture); if (linearFilter) @@ -374,7 +374,7 @@ void DecodeToTexture(u32 xfbAddr, int srcWidth, int srcHeight, GLuint destTextur // activate source texture // set srcAddr as data for source texture - glActiveTexture(GL_TEXTURE0+9); + glActiveTexture(GL_TEXTURE9); glBindTexture(GL_TEXTURE_2D, s_srcTexture); glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, srcWidth / 2, srcHeight, 0, GL_BGRA, GL_UNSIGNED_BYTE, srcAddr); |