Commit Graph

2431 Commits

Author SHA1 Message Date
28f34f53d3 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
2446808615 Use correct SOVERSION for libprojectM.so 2018-06-21 17:57:04 +02:00
5a99cf7da1 Also search for rcc-qt5 2018-06-21 17:56:10 +02:00
30f5e04a51 Add return value to non-void function template 2018-06-21 17:55:21 +02:00
a9739e1c97 add libprojectM xcode project 2018-06-17 14:02:41 +02:00
a56010bf81 merge master 2018-06-17 14:00:27 +02:00
dd4e878847 this doesn't belong in this branch 2018-06-17 13:57:46 +02:00
a399f83cda this doesn't belong in this branch 2018-06-17 13:57:27 +02:00
4a48090c06 this doesn't belong in this branch 2018-06-17 13:57:11 +02:00
2247fc1108 FTGL/Cg flags gone 2018-06-17 13:56:13 +02:00
55aaea133d this doesn't belong in this branch 2018-06-17 13:54:28 +02:00
d94c9a3042 this doesn't belong in this branch 2018-06-17 13:54:13 +02:00
7ae4ee79d2 this doesn't belong in this branch 2018-06-17 13:53:27 +02:00
829b0cc555 this doesn't belong in this branch 2018-06-17 13:52:57 +02:00
3af10288ec load from correct presets dir 2018-06-17 13:52:38 +02:00
4f254fbdaf Merge pull request #71 from deltaoscarmike/memleaks_fixes
memleaks fixes
2018-06-17 13:50:24 +02:00
389170ce06 have xcode copy all presets to $BUILT_PRODUCTS_DIR 2018-06-17 13:48:24 +02:00
d3357e29c4 Version 3.0.0 - GLES/OpenGL 3 2018-06-17 13:02:31 +02:00
e2dc9f91a3 removing cg shaders from makefile 2018-06-14 11:12:57 +03:00
60b29ba1e8 Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-14 11:12:24 +03:00
108694f6a2 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
7516a705c4 WIP: shader code update (extract from milkdrop sources) 2018-06-12 22:12:06 +02:00
26da73984f WIP: several fixes 2018-06-12 21:45:32 +02:00
1593d10656 sort of progress w/ comp/warp shader programs 2018-06-12 09:35:08 +03:00
233e9e289b load warp and comp shaders from preset into programs 2018-06-11 22:30:11 +03:00
2ce0e70a98 memleaks fixes 2018-06-10 22:02:06 +02:00
c4acacdd1c Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-06-10 21:25:24 +03:00
72a50bed0c Fix build errors (again) 2018-06-10 20:08:20 +02:00
360ef1471a Fix build errors 2018-06-10 20:01:00 +02:00
0522afe064 WIP: making preset shader program 2018-06-10 20:25:52 +03:00
794363f87d switching glsl version depends of --enable-gles configure flag
fix vao memleak
2018-06-10 19:23:41 +02:00
f7b8425963 WIP 2018-06-10 20:00:05 +03:00
57c7219aaa Merge branch 'gl-modernize' into glsl 2018-06-10 18:06:52 +03:00
80c527402a cleanup 2018-06-10 18:06:41 +03:00
8b5708e3b7 cleanup 2018-06-10 18:04:33 +03:00
048498c816 WIP preset shader loading 2018-06-10 18:00:54 +03:00
d5f81cd9bb checkpoint 2018-06-10 17:27:02 +03:00
82e2ffe521 cleanups 2018-06-10 17:07:36 +03:00
2fb79ca42b restoring 2018-06-10 17:04:34 +03:00
13fe1c5e00 makefile indentation 2018-06-10 17:01:06 +03:00
c2c00a1e1a Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
1cacdd6799 Merge pull request #70 from projectM-visualizer/gles3
GLES3
2018-06-10 16:32:01 +03:00
6cdba2c68e gles not enabled by default 2018-06-09 23:11:10 +02:00
ec7d5188a8 Merge branch 'gles3' of https://github.com/projectM-visualizer/projectm into gles3 2018-06-09 22:52:49 +02:00
b650e2323d Restore vertex layout location 2018-06-09 22:50:29 +02:00
47084821da fix undefined VAO error 2018-06-09 23:28:16 +03:00
269181d9d9 progress - glsl 410 2018-06-09 21:54:13 +03:00
0e60b1d6cb Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3 2018-06-09 21:43:18 +03:00
c9fef28a89 Downgrade shaders to glsl 1.3 2018-06-09 14:19:46 +02:00
e529008e11 Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3 2018-06-09 15:08:49 +03:00