Skip to content

V
vlc
Commit 0dab579a authored by Adrien Maglo's avatar Adrien Maglo
Browse files
Options

[OpenGL] Fix some wrong logic about GLSL version numbers.

parent d5505899
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/video_output/opengl.c
View file @ 0dab579a
...@@ -191,7 +191,7 @@ static void BuildVertexShader(vout_display_opengl_t *vgl, ...@@ -191,7 +191,7 @@ static void BuildVertexShader(vout_display_opengl_t *vgl,
{ {
/* Basic vertex shader */ /* Basic vertex shader */
const char *vertexShader = const char *vertexShader =
#ifdef USE_OPENGL_ES #if USE_OPENGL_ES == 2
"#version 100\n" "#version 100\n"
#else #else
"#version 120\n" "#version 120\n"
...@@ -238,7 +238,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl, ...@@ -238,7 +238,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl,
/* Basic linear YUV -> RGB conversion using bilinear interpolation */ /* Basic linear YUV -> RGB conversion using bilinear interpolation */
const char *template_glsl_yuv = const char *template_glsl_yuv =
#ifdef USE_OPENGL_ES #if USE_OPENGL_ES == 2
"#version 100\n" "#version 100\n"
#else #else
"#version 120\n" "#version 120\n"
...@@ -292,7 +292,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl, ...@@ -292,7 +292,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
{ {
// Simple shader for RGB // Simple shader for RGB
const char *code = const char *code =
#ifdef USE_OPENGL_ES #if USE_OPENGL_ES == 2
"#version 100\n" "#version 100\n"
#else #else
"#version 120\n" "#version 120\n"
...@@ -313,7 +313,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl, ...@@ -313,7 +313,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
{ {
// Simple shader for RGBA // Simple shader for RGBA
const char *code = const char *code =
#ifdef USE_OPENGL_ES #if USE_OPENGL_ES == 2
"#version 100\n" "#version 100\n"
#else #else
"#version 120\n" "#version 120\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment