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

Adrien Maglo git at videolan.org
Sat Dec 29 17:58:18 CET 2012


vlc | branch: master | Adrien Maglo <magsoft at videolan.org> | Sat Dec 29 17:58:08 2012 +0100| [0dab579a760c498d882d84fd6e9192bb604c34b3] | committer: Adrien Maglo

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=0dab579a760c498d882d84fd6e9192bb604c34b3
---

 modules/video_output/opengl.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/video_output/opengl.c b/modules/video_output/opengl.c
index 16dc428..229560b 100644
--- a/modules/video_output/opengl.c
+++ b/modules/video_output/opengl.c
@@ -191,7 +191,7 @@ static void BuildVertexShader(vout_display_opengl_t *vgl,
 {
     /* Basic vertex shader */
     const char *vertexShader =
-#ifdef USE_OPENGL_ES
+#if USE_OPENGL_ES == 2
         "#version 100\n"
 #else
         "#version 120\n"
@@ -238,7 +238,7 @@ static void BuildYUVFragmentShader(vout_display_opengl_t *vgl,
 
     /* Basic linear YUV -> RGB conversion using bilinear interpolation */
     const char *template_glsl_yuv =
-#ifdef USE_OPENGL_ES
+#if USE_OPENGL_ES == 2
         "#version 100\n"
 #else
         "#version 120\n"
@@ -292,7 +292,7 @@ static void BuildRGBFragmentShader(vout_display_opengl_t *vgl,
 {
     // Simple shader for RGB
     const char *code =
-#ifdef USE_OPENGL_ES
+#if USE_OPENGL_ES == 2
         "#version 100\n"
 #else
         "#version 120\n"
@@ -313,7 +313,7 @@ static void BuildRGBAFragmentShader(vout_display_opengl_t *vgl,
 {
     // Simple shader for RGBA
     const char *code =
-#ifdef USE_OPENGL_ES
+#if USE_OPENGL_ES == 2
         "#version 100\n"
 #else
         "#version 120\n"



More information about the vlc-commits mailing list