From 554d8005fa8f6b20c3cefb5c6e8c77d0d8624566 Mon Sep 17 00:00:00 2001 From: Flyinghead Date: Tue, 26 Nov 2019 11:08:35 +0100 Subject: [PATCH] gl: #version must be on first line or Mali compiler complains --- core/rend/gl4/abuffer.cpp | 3 +-- core/rend/gl4/gles.cpp | 3 +-- core/rend/gles/gles.cpp | 15 +++++---------- 3 files changed, 7 insertions(+), 14 deletions(-) diff --git a/core/rend/gl4/abuffer.cpp b/core/rend/gl4/abuffer.cpp index 4310eef78..9ed0378b9 100644 --- a/core/rend/gl4/abuffer.cpp +++ b/core/rend/gl4/abuffer.cpp @@ -285,8 +285,7 @@ void main(void) )"; static const char* VertexShaderSource = -R"( -#version 430 +R"(#version 430 in highp vec3 in_pos; diff --git a/core/rend/gl4/gles.cpp b/core/rend/gl4/gles.cpp index 6ed40fd23..be80decac 100644 --- a/core/rend/gl4/gles.cpp +++ b/core/rend/gl4/gles.cpp @@ -12,8 +12,7 @@ //Fragment and vertex shaders code -static const char* VertexShaderSource = R"( -#version 140 +static const char* VertexShaderSource = R"(#version 140 #define pp_Gouraud %d #if pp_Gouraud == 0 diff --git a/core/rend/gles/gles.cpp b/core/rend/gles/gles.cpp index d0c32cb43..5127d85fa 100644 --- a/core/rend/gles/gles.cpp +++ b/core/rend/gles/gles.cpp @@ -25,8 +25,7 @@ float fb_scale_x, fb_scale_y; // FIXME //Fragment and vertex shaders code -const char* VertexShaderSource = R"( -%s +const char* VertexShaderSource = R"(%s #define TARGET_GL %s #define pp_Gouraud %d @@ -99,8 +98,7 @@ void main() )"; const char* PixelPipelineShader = -R"( -%s +R"(%s #define TARGET_GL %s #define cp_AlphaTest %d @@ -293,8 +291,7 @@ void main() )"; const char* ModifierVolumeShader = -R"( -%s +R"(%s #define TARGET_GL %s #define GLES2 0 @@ -325,8 +322,7 @@ void main() )"; const char* OSD_VertexShader = -R"( -%s +R"(%s #define TARGET_GL %s #define GLES2 0 @@ -367,8 +363,7 @@ void main() )"; const char* OSD_Shader = -R"( -%s +R"(%s #define TARGET_GL %s #define GLES2 0