mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-29 19:50:40 +00:00
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[] = { ^~~~~~~~~~~~~~
This commit is contained in:
parent
923dd696f2
commit
22e75a2112
4 changed files with 41 additions and 10 deletions
|
@ -70,7 +70,8 @@ libgstgl_@GST_API_VERSION@include_HEADERS = \
|
||||||
|
|
||||||
noinst_HEADERS = \
|
noinst_HEADERS = \
|
||||||
gstglsl_private.h \
|
gstglsl_private.h \
|
||||||
utils/opengl_versions.h
|
utils/opengl_versions.h \
|
||||||
|
utils/gles_versions.h
|
||||||
|
|
||||||
|
|
||||||
libgstgl_@GST_API_VERSION@_la_LIBADD = \
|
libgstgl_@GST_API_VERSION@_la_LIBADD = \
|
||||||
|
|
|
@ -31,6 +31,7 @@
|
||||||
#include "gstglcontext_egl.h"
|
#include "gstglcontext_egl.h"
|
||||||
#include <gst/gl/egl/gstegl.h>
|
#include <gst/gl/egl/gstegl.h>
|
||||||
#include "../utils/opengl_versions.h"
|
#include "../utils/opengl_versions.h"
|
||||||
|
#include "../utils/gles_versions.h"
|
||||||
|
|
||||||
#if GST_GL_HAVE_WINDOW_X11
|
#if GST_GL_HAVE_WINDOW_X11
|
||||||
#include "../x11/gstglwindow_x11.h"
|
#include "../x11/gstglwindow_x11.h"
|
||||||
|
|
38
gst-libs/gst/gl/utils/gles_versions.h
Normal file
38
gst-libs/gst/gl/utils/gles_versions.h
Normal file
|
@ -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_ */
|
|
@ -49,15 +49,6 @@ static const struct { int major, minor; } opengl_versions[] = {
|
||||||
{0, 0} /* end of list */
|
{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* */
|
/* *INDENT-ON* */
|
||||||
|
|
||||||
#endif /* _OPENGL_VERSIONS_H_ */
|
#endif /* _OPENGL_VERSIONS_H_ */
|
||||||
|
|
Loading…
Reference in a new issue