diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | libvo/vo_opengl.c | 4 | ||||
| -rw-r--r-- | libvo/vo_opengl_shaders.glsl (renamed from libvo/vo_gl3_shaders.glsl) | 0 |
4 files changed, 6 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore index 942a428b39..a3cff725c0 100644 --- a/.gitignore +++ b/.gitignore @@ -15,7 +15,7 @@ /TAGS /locale /po -/libvo/vo_gl3_shaders.h +/libvo/vo_opengl_shaders.h /libmpdemux/ebml_defs.c /libmpdemux/ebml_types.h /libvo/vdpau_template.c @@ -367,8 +367,8 @@ libmpdemux/ebml.c: libmpdemux/ebml_defs.c libmpdemux/ebml_defs.c: TOOLS/matroska.py ./$< --generate-definitions > $@ -libvo/vo_opengl.c: libvo/vo_gl3_shaders.h -libvo/vo_gl3_shaders.h: TOOLS/file2string.py libvo/vo_gl3_shaders.glsl +libvo/vo_opengl.c: libvo/vo_opengl_shaders.h +libvo/vo_opengl_shaders.h: TOOLS/file2string.py libvo/vo_opengl_shaders.glsl ./$^ >$@ sub/osd_libass.c: sub/osd_font.h @@ -469,7 +469,7 @@ clean: -$(RM) input/input_conf.h -$(RM) libvo/vdpau_template.c -$(RM) libmpdemux/ebml_types.h libmpdemux/ebml_defs.c - -$(RM) libvo/vo_gl3_shaders.h + -$(RM) libvo/vo_opengl_shaders.h -$(RM) sub/osd_font.h distclean: clean diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c index 329d19370f..d2a28aa41a 100644 --- a/libvo/vo_opengl.c +++ b/libvo/vo_opengl.c @@ -55,8 +55,8 @@ #include "sub/ass_mp.h" static const char vo_gl3_shaders[] = -// Generated from libvo/vo_gl3_shaders.glsl -#include "libvo/vo_gl3_shaders.h" +// Generated from libvo/vo_opengl_shaders.glsl +#include "libvo/vo_opengl_shaders.h" ; // How many parts the OSD may consist of at most. diff --git a/libvo/vo_gl3_shaders.glsl b/libvo/vo_opengl_shaders.glsl index 207b44b4ba..207b44b4ba 100644 --- a/libvo/vo_gl3_shaders.glsl +++ b/libvo/vo_opengl_shaders.glsl |