summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2016-02-18 10:33:20 +0200
committerSebastian Dröge <sebastian@centricular.com>2016-02-18 10:33:20 +0200
commit22e75a2112ee2cca9e729b4e30727605689e6b07 (patch)
tree1e20fe35c36e9b98e6e6c58d327ad3abb4b2b59c
parent923dd696f2d7777bd7554fb5ab69b63530f54865 (diff)
gl: Fix compiler warning about unused const variable with gcc 6
CC libgstgl_x11_la-gstglcontext_glx.lo In file included from gstglcontext_glx.c:39:0: ../utils/opengl_versions.h:52:43: error: ‘gles2_versions’ defined but not used [-Werror=unused-const-variable] static const struct { int major, minor; } gles2_versions[] = { ^~~~~~~~~~~~~~
-rw-r--r--gst-libs/gst/gl/Makefile.am3
-rw-r--r--gst-libs/gst/gl/egl/gstglcontext_egl.c1
-rw-r--r--gst-libs/gst/gl/utils/gles_versions.h38
-rw-r--r--gst-libs/gst/gl/utils/opengl_versions.h9
4 files changed, 41 insertions, 10 deletions
diff --git a/gst-libs/gst/gl/Makefile.am b/gst-libs/gst/gl/Makefile.am
index 7301b0460..f1cb9e178 100644
--- a/gst-libs/gst/gl/Makefile.am
+++ b/gst-libs/gst/gl/Makefile.am
@@ -70,7 +70,8 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
noinst_HEADERS = \
gstglsl_private.h \
- utils/opengl_versions.h
+ utils/opengl_versions.h \
+ utils/gles_versions.h
libgstgl_@GST_API_VERSION@_la_LIBADD = \
diff --git a/gst-libs/gst/gl/egl/gstglcontext_egl.c b/gst-libs/gst/gl/egl/gstglcontext_egl.c
index ce8d8f589..ceafdf344 100644
--- a/gst-libs/gst/gl/egl/gstglcontext_egl.c
+++ b/gst-libs/gst/gl/egl/gstglcontext_egl.c
@@ -31,6 +31,7 @@
#include "gstglcontext_egl.h"
#include <gst/gl/egl/gstegl.h>
#include "../utils/opengl_versions.h"
+#include "../utils/gles_versions.h"
#if GST_GL_HAVE_WINDOW_X11
#include "../x11/gstglwindow_x11.h"
diff --git a/gst-libs/gst/gl/utils/gles_versions.h b/gst-libs/gst/gl/utils/gles_versions.h
new file mode 100644
index 000000000..e80bf1e7e
--- /dev/null
+++ b/gst-libs/gst/gl/utils/gles_versions.h
@@ -0,0 +1,38 @@
+/*
+ * GStreamer
+ * Copyright (C) 2015 Matthew Waters <matthew@centricular.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
+ * Boston, MA 02110-1301, USA.
+ */
+
+#ifndef _GLES_VERSIONS_H_
+#define _GLES_VERSIONS_H_
+
+/* list of known OpenGL versions */
+/* *INDENT-OFF* */
+
+static const struct { int major, minor; } gles2_versions[] = {
+ {3, 2},
+ {3, 1},
+ {3, 0},
+
+ {2, 0},
+
+ {0, 0} /* end of list */
+};
+/* *INDENT-ON* */
+
+#endif /* _GLES_VERSIONS_H_ */
diff --git a/gst-libs/gst/gl/utils/opengl_versions.h b/gst-libs/gst/gl/utils/opengl_versions.h
index d024e3701..081caeb47 100644
--- a/gst-libs/gst/gl/utils/opengl_versions.h
+++ b/gst-libs/gst/gl/utils/opengl_versions.h
@@ -49,15 +49,6 @@ static const struct { int major, minor; } opengl_versions[] = {
{0, 0} /* end of list */
};
-static const struct { int major, minor; } gles2_versions[] = {
- {3, 2},
- {3, 1},
- {3, 0},
-
- {2, 0},
-
- {0, 0} /* end of list */
-};
/* *INDENT-ON* */
#endif /* _OPENGL_VERSIONS_H_ */