From 339c4d7dc3551ff73d2c1cd7aa990cccfe155eaf Mon Sep 17 00:00:00 2001 From: Henrik Rydgard Date: Mon, 9 Jun 2014 19:04:13 +0200 Subject: [PATCH] Fix a bunch of typos breaking various utility shaders on GLES Fixes white shadows in FF-Type 0 on Tegra, as mentioned in #6268 --- GPU/GLES/DepalettizeShader.cpp | 8 ++++---- GPU/GLES/ShaderManager.cpp | 2 +- GPU/GLES/StencilBuffer.cpp | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/GPU/GLES/DepalettizeShader.cpp b/GPU/GLES/DepalettizeShader.cpp index 7b008c6a7a..f929b33a94 100644 --- a/GPU/GLES/DepalettizeShader.cpp +++ b/GPU/GLES/DepalettizeShader.cpp @@ -31,7 +31,7 @@ static const int DEPAL_TEXTURE_OLD_AGE = 120; #endif static const char *depalVShader100 = -#ifdef USING_GLES +#ifdef USING_GLES2 "#version 100\n" "precision highp float;\n" #endif @@ -44,7 +44,7 @@ static const char *depalVShader100 = "}\n"; static const char *depalVShader300 = -#ifdef USING_GLES +#ifdef USING_GLES2 "#version 300 es\n" "precision highp float;\n" #else @@ -112,7 +112,7 @@ DepalShaderCache::~DepalShaderCache() { // Uses integer instructions available since OpenGL 3.0. Suitable for ES 3.0 as well. void GenerateDepalShader300(char *buffer, GEBufferFormat pixelFormat) { char *p = buffer; -#ifdef USING_GLES +#ifdef USING_GLES2 WRITE(p, "#version 300 es\n"); WRITE(p, "precision mediump float;\n"); #else @@ -298,7 +298,7 @@ void GenerateDepalShader100(char *buffer, GEBufferFormat pixelFormat) { float texel_offset = ((float)clutBase + 0.5f) / texturePixels; sprintf(offset, " + %f", texel_offset); -#ifdef USING_GLES +#ifdef USING_GLES2 WRITE(p, "#version 100\n"); WRITE(p, "precision mediump float;\n"); #else diff --git a/GPU/GLES/ShaderManager.cpp b/GPU/GLES/ShaderManager.cpp index 10bec22019..72bcb2773b 100644 --- a/GPU/GLES/ShaderManager.cpp +++ b/GPU/GLES/ShaderManager.cpp @@ -111,7 +111,7 @@ LinkedShader::LinkedShader(Shader *vs, Shader *fs, u32 vertType, bool useHWTrans // Detaching shaders is annoying when debugging with gDebugger // so let's not do that on Windows. -#ifdef USING_GLES +#ifdef USING_GLES2 glDetachShader(program, vs->shader); glDetachShader(program, fs->shader); #endif diff --git a/GPU/GLES/StencilBuffer.cpp b/GPU/GLES/StencilBuffer.cpp index fc3d417a24..192d9c2895 100644 --- a/GPU/GLES/StencilBuffer.cpp +++ b/GPU/GLES/StencilBuffer.cpp @@ -22,7 +22,7 @@ #include "GPU/GLES/ShaderManager.h" static const char *stencil_fs = -#ifdef USING_GLES +#ifdef USING_GLES2 "#version 100\n" "precision highp float;\n" #endif @@ -38,7 +38,7 @@ static const char *stencil_fs = "}\n"; static const char *stencil_vs = -#ifdef USING_GLES +#ifdef USING_GLES2 "#version 100\n" "precision highp float;\n" #endif