From: Juan Pablo Ugarte <ugarte@endlessm.com>
Date: Wed, 11 Jan 2017 13:37:34 +0000 (-0300)
Subject: glslstage: define GL constants if needed instead of using #ifdef
X-Git-Tag: 1.19.3~511^2~1989^2~147
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c469827ddb018038cc1e2e2d1acfae148099e12b;p=platform%2Fupstream%2Fgstreamer.git

glslstage: define GL constants if needed instead of using #ifdef

https://bugzilla.gnome.org/show_bug.cgi?id=777144
---

diff --git a/gst-libs/gst/gl/gstglslstage.c b/gst-libs/gst/gl/gstglslstage.c
index 708dff1..60a5af7 100644
--- a/gst-libs/gst/gl/gstglslstage.c
+++ b/gst-libs/gst/gl/gstglslstage.c
@@ -27,6 +27,19 @@
 #include "gstglslstage.h"
 #include "gstglsl_private.h"
 
+#ifndef GL_GEOMETRY_SHADER
+#define GL_GEOMETRY_SHADER        0x8DD9
+#endif
+#ifndef GL_COMPUTE_SHADER
+#define GL_COMPUTE_SHADER         0x91B9
+#endif
+#ifndef GL_TESS_CONTROL_SHADER
+#define GL_TESS_CONTROL_SHADER    0x8E88
+#endif
+#ifndef GL_TESS_EVALUATION_SHADER
+#define GL_TESS_EVALUATION_SHADER 0x8E87
+#endif
+
 /**
  * SECTION:gstglslstage
  * @short_description: object for dealing with OpenGL shader stages
@@ -130,18 +143,10 @@ _is_valid_shader_type (GLenum type)
   switch (type) {
     case GL_VERTEX_SHADER:
     case GL_FRAGMENT_SHADER:
-#ifdef GL_TESS_CONTROL_SHADER
     case GL_TESS_CONTROL_SHADER:
-#endif
-#ifdef GL_TESS_EVALUATION_SHADER
     case GL_TESS_EVALUATION_SHADER:
-#endif
-#ifdef GL_GEOMETRY_SHADER
     case GL_GEOMETRY_SHADER:
-#endif
-#ifdef GL_COMPUTE_SHADER
     case GL_COMPUTE_SHADER:
-#endif
       return TRUE;
     default:
       return FALSE;
@@ -156,22 +161,14 @@ _shader_type_to_string (GLenum type)
       return "vertex";
     case GL_FRAGMENT_SHADER:
       return "fragment";
-#ifdef GL_TESS_CONTROL_SHADER
     case GL_TESS_CONTROL_SHADER:
       return "tesselation control";
-#endif
-#ifdef GL_TESS_EVALUATION_SHADER
     case GL_TESS_EVALUATION_SHADER:
       return "tesselation evaluation";
-#endif
-#ifdef GL_GEOMETRY_SHADER
     case GL_GEOMETRY_SHADER:
       return "geometry";
-#endif
-#ifdef GL_COMPUTE_SHADER
     case GL_COMPUTE_SHADER:
       return "compute";
-#endif
     default:
       return "unknown";
   }