Commit Graph

1581 Commits

Author SHA1 Message Date
c8d064da3f Merge pull request #75 from luigino/minor
Minor fixes
2018-06-22 11:58:47 -07: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
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
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
2ce0e70a98 memleaks fixes 2018-06-10 22:02:06 +02:00
794363f87d switching glsl version depends of --enable-gles configure flag
fix vao memleak
2018-06-10 19:23:41 +02: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
44bcae39b8 GL 1.3 stuff 2018-06-09 15:08:34 +03:00
0054ddbe09 SDL GL 2018-06-09 14:09:58 +03:00
dbceb48a65 SDL GL 2018-06-09 14:08:29 +03:00
18b0efce7a Disabling FTGL and Cg 2018-06-09 12:42:29 +02:00
caf71b3ab4 Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3 2018-06-09 00:22:36 +03:00
d89114c168 C++11 nullptr to NULL
C++11 lambda conversion
2018-06-08 16:25:07 +02:00
fdbfb1e7ba Merge pull request #69 from deltaoscarmike/gles3
OpenGL ES 3.0 support
2018-06-08 08:34:55 +03:00
d3128c2c63 FTGL doesn't support modern OpenGL: disabling 2018-06-08 07:18:07 +02:00
717eb35749 Move optional gl32.h which is only used for GL debug 2018-06-08 07:07:33 +02:00
c2b70915dd Forgot to add libglm...again 2018-06-07 19:46:24 +02:00
88665e7495 Fix glm presence checking by autotools 2018-06-07 19:19:13 +02:00
46e92f41ed Merge pull request #68 from deltaoscarmike/master
FIX: crash if preset directory is empty.
2018-06-07 12:16:48 +03:00
b301cd8b0c fixing up GL bits and pieces 2018-06-07 10:38:10 +03:00
1a01c7fd0c OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
76601c6ff4 FIX: crash if preset directory is empty.
The crash happens in QProjectM_MainWindow::refreshHeaders which is dependent of columns count.
Columns headers doesn't need to be hidden if preset folder is empty.
2018-06-06 19:13:33 +02:00
b4279c24f7 Merge pull request #67 from schnitzeltony/master
Makefile.am: Fix installation with DESTDIR set
2018-06-05 08:21:05 +02:00
7d414b93a9 Makefile.am: Fix installation with DESTDIR set
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
2018-06-04 22:35:38 +02:00
b91078e311 copying this into master to make diffing easier 2018-06-03 15:08:15 +02:00
c4d4410045 Merge pull request #65 from mbellew/issue_64
fix for issue 64
2018-06-02 15:01:28 +02:00
d2d2007366 fix for issue 64 2018-05-29 07:14:13 -07:00
5c66e08123 Merge pull request #62 from mbellew/sse
SSE version of PresetOutputs::PerPixelMath
2018-05-23 10:11:22 +03:00
58722d1fc5 fix signature for _mm_sincosf(), thanks Mischa 2018-05-22 12:45:07 -07:00
9b8a9a4f06 AC_CHECK_FUNCS_ONCE 2018-05-22 12:03:26 -07:00
8b84c0f911 __APPLE__ 2018-05-21 22:22:39 -07:00
108b6b013f TARGET_OS_MAC 2018-05-21 21:00:57 -07:00
7fee1b6632 some comments 2018-05-20 16:34:52 -07:00
845cb86e02 alloc mesh as one memory block 2018-05-20 16:25:20 -07:00
834408bf03 Merge pull request #61 from mbellew/parameterexpr_cleanup
ParameterExpr cleanup
2018-05-18 10:22:10 +03:00
a9874619a6 move matrix_flag check back to eval time 2018-05-17 14:49:45 -07:00
0650aa11d2 fix responsiveness of SDL app 2018-05-17 14:34:48 -07:00
5c38e9c5ec cleanup 2018-05-16 09:32:55 -07:00