Commit Graph

121 Commits

Author SHA1 Message Date
d0b54ba46c 147 (#149)
* attempt at fixing synchronization problem
https://github.com/projectM-visualizer/projectm/issues/147

* fix init

* add header to Makefile.am

* undo accidental commit
2019-01-12 22:40:19 +00:00
9d82515a9b xcode cleanup 2019-01-01 13:27:57 +02:00
7d279db9bb Merge pull request #123 from projectM-visualizer/gles_fixes
DX to openGL/openGLES transpilation fixes
2018-11-23 12:27:57 +01:00
d9f65d9211 Disable OGL debug for GLES build
Memory leak fix
2018-11-21 18:39:52 +01:00
0e4436026e easy asan activation 2018-11-20 19:21:34 +01:00
069c005c5b audio emoji is back 2018-11-20 19:19:59 +01:00
d4d74f6d05 Build warnings cleanup 2018-11-17 11:42:28 +01:00
dd27a53889 readme, comments 2018-09-30 15:37:45 +03:00
68844b7d46 Removing GLEW 2018-09-22 11:39:19 +03:00
c7b2508fb5 Merge pull request #26 from projectM-visualizer/glsl
Re-enable shaders on modern platforms by transpiling HLSL to GLSL on the fly.
Better GLES support.
Running successfully on embedded systems with GLES and shaders. Compiles and almost runs with emscripten now (#92).
Mega props 👏 => @deltaoscarmike <= 👏
2018-09-08 11:09:28 +03:00
01ea43f5dc Fix unlock FPS flag
Add comments for test flags
2018-08-25 20:19:10 +02:00
d6bb6f96f4 Fix issue #94 build error 2018-08-23 21:55:07 +02:00
fd0a987259 Small fixes 2018-08-22 21:05:42 +02:00
99710c6489 Remove useless files 2018-08-21 19:36:38 +02:00
d4ccf8909f Add a fast preset switching test flag to check for shader compilation issues 2018-08-21 19:27:40 +02:00
4ef9b71fd9 osx packaging w/ xcode 2018-08-02 00:52:52 +03:00
72cdf9cd22 output installer package and app bundle on osx 2018-08-02 00:10:54 +03:00
4966e76b7e makefile stuff for emscripten 2018-08-01 17:23:45 +03:00
dbe822aff8 merge 2018-08-01 16:26:37 +03:00
463db6132b bundle SDL for osx WIP 2018-07-31 12:07:28 +03:00
e0619ea9c4 Merge branch 'master' into glsl 2018-07-28 20:06:25 +02:00
6425b561a5 GLES and SSE2 fix stuff 2018-07-28 16:30:30 +00:00
2fde689eac Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-26 00:04:38 +03:00
984f5ceaf8 read FPS from config file for SDL version 2018-07-26 00:04:34 +03:00
7628fd018c - Fix for travis
- Convert glProgramUniform* for OGL 3.x compatibility
2018-07-25 19:38:17 +02:00
ed37ab3969 some cleanups. fixed dylib loader path for SDL2 so we can bundle it together. fix some minor syntax things. remove cg code. 2018-07-23 14:29:08 +03:00
0517b76c5d Merge branch 'glsl' of github.com:projectM-visualizer/projectm into glsl 2018-07-23 12:57:03 +03:00
9f554788f6 bleh 2018-07-23 12:53:04 +03:00
ddcd9fb735 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
dc9f700690 Add testing switches:
- fake audio
- unlock FPS (linux only)
2018-07-18 21:46:01 +02:00
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
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
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
e2dc9f91a3 removing cg shaders from makefile 2018-06-14 11:12:57 +03:00
2ce0e70a98 memleaks fixes 2018-06-10 22:02:06 +02:00
048498c816 WIP preset shader loading 2018-06-10 18:00:54 +03:00
82e2ffe521 cleanups 2018-06-10 17:07:36 +03:00
c2c00a1e1a Merging GLES3 changes in 2018-06-10 16:59:12 +03:00
0054ddbe09 SDL GL 2018-06-09 14:09:58 +03:00
dbceb48a65 SDL GL 2018-06-09 14:08:29 +03:00
717eb35749 Move optional gl32.h which is only used for GL debug 2018-06-08 07:07:33 +02:00
1a01c7fd0c OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
4b2ba9513b WIP 2018-06-02 14:54:46 +02: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