Commit Graph

1636 Commits

Author SHA1 Message Date
542900a9c3 Texture manager rewrite to add sampler support (used by shaders)
Renderer target rewrite to remove FBO support (better fps)
Render to texture support restored
2018-07-22 09:16:06 +02:00
56830d87b1 Add testing switches:
- fake audio
- unlock FPS (linux only)
2018-07-18 21:46:01 +02:00
d9d3ba8427 Removing Cg leftovers 2018-07-18 21:41:47 +02:00
3ed82ca079 Disabling PerPixelMath_sse (issue #84) 2018-07-18 20:50:53 +02:00
cc60a7a8e9 WIP: now some presets shaders are compiled
- HLSL: Lots of HLSLparser fixes
- HLSL: Add Preprocessor macro support
- HLSL: Add functions: modf, tan
- HLSL: Add while loops support
- Shader static code fixes
- Add define DUMP_SHADERS_ON_ERROR
- ShaderEngine.hpp cleanup
- Restore current preset message
- Remove useless messages
2018-06-22 19:38:54 +02:00
78702bed97 merge master 2018-06-17 14:00:27 +02:00
aeb3f4523d this doesn't belong in this branch 2018-06-17 13:57:46 +02:00
af2e10b39c this doesn't belong in this branch 2018-06-17 13:57:27 +02:00
90324a9036 this doesn't belong in this branch 2018-06-17 13:57:11 +02:00
ba97dfcc5f FTGL/Cg flags gone 2018-06-17 13:56:13 +02:00
1edac3e1dc this doesn't belong in this branch 2018-06-17 13:54:28 +02:00
f17e1bd74a this doesn't belong in this branch 2018-06-17 13:54:13 +02:00
aa9ed342a3 this doesn't belong in this branch 2018-06-17 13:53:27 +02:00
e4759a560b this doesn't belong in this branch 2018-06-17 13:52:57 +02:00
3b1ef085b1 load from correct presets dir 2018-06-17 13:52:38 +02:00
1a32b440e3 have xcode copy all presets to $BUILT_PRODUCTS_DIR 2018-06-17 13:48:24 +02:00
59a65a1dc7 Version 3.0.0 - GLES/OpenGL 3 v3.0.0 2018-06-17 13:02:31 +02:00
e4b1bba02a removing cg shaders from makefile 2018-06-14 11:12:57 +03:00
00857ed232 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-14 11:12:24 +03:00
a410acc14c Merge pull request #72 from projectM-visualizer/gles3
switching glsl version depends of --enable-gles configure flag
2018-06-13 08:28:09 +03:00
ba4adecf97 WIP: shader code update (extract from milkdrop sources) 2018-06-12 22:12:06 +02:00
0c9a8d3bfb WIP: several fixes 2018-06-12 21:45:32 +02:00
b0b22ac302 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
42c583bd8d load warp and comp shaders from preset into programs 2018-06-11 22:30:11 +03:00
b6f5483701 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-10 21:25:24 +03:00
e9cfc89224 Fix build errors (again) 2018-06-10 20:08:20 +02:00
6055a00790 Fix build errors 2018-06-10 20:01:00 +02:00
bbc9bd51c0 WIP: making preset shader program 2018-06-10 20:25:52 +03:00
444759fad6 switching glsl version depends of --enable-gles configure flag
fix vao memleak
2018-06-10 19:23:41 +02:00
f1635797ab WIP 2018-06-10 20:00:05 +03:00
0916ebe1fe Merge branch 'gl-modernize' into glsl 2018-06-10 18:06:52 +03:00
c4c45b50db cleanup 2018-06-10 18:06:41 +03:00
36babd1427 cleanup 2018-06-10 18:04:33 +03:00
3cad9c3b85 WIP preset shader loading 2018-06-10 18:00:54 +03:00
dacf7582b8 checkpoint 2018-06-10 17:27:02 +03:00
6cb0123537 cleanups 2018-06-10 17:07:36 +03:00
3bdc61a479 restoring 2018-06-10 17:04:34 +03:00
5e5a43bebe makefile indentation 2018-06-10 17:01:06 +03:00
3511da0939 Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
e6a2df5b00 Merge pull request #70 from projectM-visualizer/gles3
GLES3
2018-06-10 16:32:01 +03:00
f7bf7b7d5c gles not enabled by default 2018-06-09 23:11:10 +02:00
b2fe0384cc Merge branch 'gles3' of https://github.com/projectM-visualizer/projectm into gles3 2018-06-09 22:52:49 +02:00
2c321aea20 Restore vertex layout location 2018-06-09 22:50:29 +02:00
133cb6bd00 fix undefined VAO error 2018-06-09 23:28:16 +03:00
266b5e1ed0 progress - glsl 410 2018-06-09 21:54:13 +03:00
b1564b8167 Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3 2018-06-09 21:43:18 +03:00
ad2acbf21b Downgrade shaders to glsl 1.3 2018-06-09 14:19:46 +02:00
d30e58bb4e Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3 2018-06-09 15:08:49 +03:00
0b662c87f4 GL 1.3 stuff 2018-06-09 15:08:34 +03:00
630a92ab53 SDL GL 2018-06-09 14:09:58 +03:00