Commit Graph

1595 Commits

Author SHA1 Message Date
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
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
95f603b7f8 render/shader context 2018-06-07 09:38:52 +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
4eb2852af8 Merge branch 'master' into gl-modernize 2018-06-03 15:11:24 +02:00
b91078e311 copying this into master to make diffing easier 2018-06-03 15:08:15 +02:00
863fe4c364 WIP I don't know what I'm doing lol help 2018-06-03 15:05:59 +02:00
9a6d4db43f lot more modernization work I have no idea if it's correct lol 2018-06-02 21:24:11 +02:00
b91100782a cleanup 2018-06-02 17:10:22 +02:00
a9ca405b72 (basic) shaders compiling 2018-06-02 16:52:15 +02:00
dc06f9a7d7 start of GL3/GLES modernization 2018-06-02 16:09:01 +02:00
c4d4410045 Merge pull request #65 from mbellew/issue_64
fix for issue 64
2018-06-02 15:01:28 +02:00
4b2ba9513b WIP 2018-06-02 14:54:46 +02:00
d2d2007366 fix for issue 64 2018-05-29 07:14:13 -07:00
b03fb81711 not quite working HLSL->GLSL translation... has some issues 2018-05-28 00:41:52 +03:00
7ced2f3ce7 files I did not mean to commit 2018-05-27 22:22:58 +03:00
c320816ec9 files I did not mean to commit 2018-05-27 22:22:24 +03:00
b12522cabb remove this 2018-05-27 22:21:52 +03:00
501598deec files I did not mean to commit 2018-05-27 22:21:13 +03:00
376699dfc4 Merge branch 'master' into glsl
Merge master + work on HLSL->GLSL transpilation
2018-05-27 22:17:07 +03: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