From 7ad6270623737341818df2e9961d2dbd844a4a79 Mon Sep 17 00:00:00 2001 From: "Unknown W. Brackets" Date: Sun, 23 Dec 2018 20:21:17 -0800 Subject: [PATCH] GLES: Remove spurious semicolons in shaders. Were causing compile errors on some devices. --- GPU/D3D11/DepalettizeShaderD3D11.cpp | 2 +- GPU/Directx9/DepalettizeShaderDX9.cpp | 2 +- GPU/Directx9/FramebufferDX9.cpp | 4 ++-- GPU/GLES/DepalettizeShaderGLES.cpp | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/GPU/D3D11/DepalettizeShaderD3D11.cpp b/GPU/D3D11/DepalettizeShaderD3D11.cpp index ddd17dc3a881..834b2a5a3e1f 100644 --- a/GPU/D3D11/DepalettizeShaderD3D11.cpp +++ b/GPU/D3D11/DepalettizeShaderD3D11.cpp @@ -47,7 +47,7 @@ VS_OUT main(VS_IN input) { output.Texcoord = input.a_texcoord0; output.Position = float4(input.a_position, 1.0); return output; -}; +} )"; static const D3D11_INPUT_ELEMENT_DESC g_DepalVertexElements[] = { diff --git a/GPU/Directx9/DepalettizeShaderDX9.cpp b/GPU/Directx9/DepalettizeShaderDX9.cpp index 6c387e1618a9..2365e41d58df 100644 --- a/GPU/Directx9/DepalettizeShaderDX9.cpp +++ b/GPU/Directx9/DepalettizeShaderDX9.cpp @@ -50,7 +50,7 @@ VS_OUT main(VS_IN input) { output.Texcoord = input.a_texcoord0; output.Position = float4(input.a_position, 1.0); return output; -}; +} )"; DepalShaderCacheDX9::DepalShaderCacheDX9(Draw::DrawContext *draw) : vertexShader_(nullptr) { diff --git a/GPU/Directx9/FramebufferDX9.cpp b/GPU/Directx9/FramebufferDX9.cpp index 8631e7b5dbb5..e6f215168edb 100644 --- a/GPU/Directx9/FramebufferDX9.cpp +++ b/GPU/Directx9/FramebufferDX9.cpp @@ -61,7 +61,7 @@ VS_OUT main( VS_IN In ) { Out.ProjPos = In.ObjPos; Out.Uv = In.Uv; return Out; -}; +} )"; static const char *pscode = R"( @@ -72,7 +72,7 @@ struct PS_IN { float4 main( PS_IN In ) : COLOR { float4 c = tex2D(s, In.Uv); return c; -}; +} )"; static const D3DVERTEXELEMENT9 g_FramebufferVertexElements[] = { diff --git a/GPU/GLES/DepalettizeShaderGLES.cpp b/GPU/GLES/DepalettizeShaderGLES.cpp index a6686a5a9120..c973909c798d 100644 --- a/GPU/GLES/DepalettizeShaderGLES.cpp +++ b/GPU/GLES/DepalettizeShaderGLES.cpp @@ -35,7 +35,7 @@ varying vec2 v_texcoord0; void main() { v_texcoord0 = a_texcoord0; gl_Position = a_position; -}; +} )"; static const char *depalVShader300 = R"( @@ -48,7 +48,7 @@ out vec2 v_texcoord0; void main() { v_texcoord0 = a_texcoord0; gl_Position = a_position; -}; +} )"; DepalShaderCacheGLES::DepalShaderCacheGLES(Draw::DrawContext *draw) {