Commit 26b3955a authored by Tim-Philipp Müller's avatar Tim-Philipp Müller 🐠

gl: use #ifdef HAVE_* instead of #if HAVE_FOO

parent 59fe9c91
......@@ -59,7 +59,7 @@
#include <gst/gl/gstglfuncs.h>
#include "gstglfiltershader.h"
#if HAVE_GRAPHENE
#ifdef HAVE_GRAPHENE
#include <graphene-gobject.h>
#endif
......@@ -360,7 +360,7 @@ _set_uniform (GQuark field_id, const GValue * value, gpointer user_data)
} else if (G_TYPE_CHECK_VALUE_TYPE ((value), G_TYPE_FLOAT)) {
gst_gl_shader_set_uniform_1f (shader, field_name,
g_value_get_float (value));
#if HAVE_GRAPHENE
#ifdef HAVE_GRAPHENE
} else if (G_TYPE_CHECK_VALUE_TYPE ((value), GRAPHENE_TYPE_VEC2)) {
graphene_vec2_t *vec2 = g_value_get_boxed (value);
float x = graphene_vec2_get_x (vec2);
......
......@@ -65,15 +65,13 @@
#include "gstgltestsrc.h"
#include "gstgldeinterlace.h"
#if HAVE_GRAPHENE
#ifdef HAVE_GRAPHENE
#include "gstgltransformation.h"
#include "gstglvideoflip.h"
#endif
#if HAVE_JPEG
#if HAVE_PNG
#if defined(HAVE_JPEG) && defined(HAVE_PNG)
#include "gstgloverlay.h"
#endif /* HAVE_PNG */
#endif /* HAVE_JPEG */
#endif
#if GST_GL_HAVE_OPENGL
#include "gstglfilterglass.h"
......@@ -171,7 +169,7 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_FILTER_CUBE)) {
return FALSE;
}
#if HAVE_GRAPHENE
#ifdef HAVE_GRAPHENE
if (!gst_element_register (plugin, "gltransformation",
GST_RANK_NONE, GST_TYPE_GL_TRANSFORMATION)) {
return FALSE;
......@@ -236,14 +234,12 @@ plugin_init (GstPlugin * plugin)
GST_RANK_NONE, GST_TYPE_GL_DEINTERLACE)) {
return FALSE;
}
#if HAVE_JPEG
#if HAVE_PNG
#if defined(HAVE_JPEG) && defined(HAVE_PNG)
if (!gst_element_register (plugin, "gloverlay",
GST_RANK_NONE, gst_gl_overlay_get_type ())) {
return FALSE;
}
#endif /* HAVE_PNG */
#endif /* HAVE_JPEG */
#endif
#if GST_GL_HAVE_OPENGL
if (!gst_element_register (plugin, "glfilterglass",
GST_RANK_NONE, GST_TYPE_GL_FILTER_GLASS)) {
......
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