From e74a4d5bc0b101fbfb371942c00d3a77267dc4a6 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 12 Mar 2015 21:57:54 +0100 Subject: vo_opengl: refactor shader generation (part 1) The basic idea is to use dynamically generated shaders instead of a single monolithic file + a ton of ifdefs. Instead of having to setup every aspect of it separately (like compiling shaders, setting uniforms, perfoming the actual rendering steps, the GLSL parts), we generate the GLSL on the fly, and perform the rendering at the same time. The GLSL is regenerated every frame, but the actual compiled OpenGL-level shaders are cached, which makes it fast again. Almost all logic can be in a single place. The new code is significantly more flexible, which allows us to improve the code clarity, performance and add more features easily. This commit is incomplete. It drops almost all previous code, and readds only the most important things (some of them actually buggy). The next commit will complete it - it's separate to preserve authorship information. --- old-makefile | 5 ----- 1 file changed, 5 deletions(-) (limited to 'old-makefile') diff --git a/old-makefile b/old-makefile index b9fbbaaa50..b81b106e60 100644 --- a/old-makefile +++ b/old-makefile @@ -358,10 +358,6 @@ demux/ebml.c: demux/ebml_defs.c demux/ebml_defs.c: TOOLS/matroska.pl $(MKVLIB_DEPS) ./$< --generate-definitions > $@ -video/out/gl_video.c: video/out/gl_video_shaders.h -video/out/gl_video_shaders.h: TOOLS/file2string.pl video/out/gl_video_shaders.glsl - ./$^ >$@ - video/out/x11_common.c: video/out/x11_icon.inc video/out/x11_icon.inc: TOOLS/file2string.pl video/out/x11_icon.bin ./$^ >$@ @@ -475,7 +471,6 @@ clean: -$(RM) input/input_conf.h -$(RM) video/out/vdpau_template.c -$(RM) demux/ebml_types.h demux/ebml_defs.c - -$(RM) video/out/gl_video_shaders.h -$(RM) video/out/x11_icon.inc -$(RM) sub/osd_font.h -$(RM) player/lua/defaults.inc -- cgit v1.2.3