Commit Graph

54 Commits

Author SHA1 Message Date
e2a7531d2f typo fix 2019-10-05 21:23:42 +03:00
4fd40d0efc GLSL and emscripten - JavaScript and WebGL support (#92)
* add glm lib in vendor folder

* fix makefile

* add more help and context to emscripten readme

* add correct output parameter to emcc

* add how to restart the process to the readme

* simplify emscripten compilation

* apply patch

* fix blur shaders to work with WebGL
2019-05-11 19:07:49 +03:00
835474f1d2 modify for WINRT support 2019-04-26 14:57:58 -04:00
b92a283b43 Windows build with MSVC (#181)
credit: @mancoast 

* msvc

* include glew for windows

* fix usage of std namespace with win32

* Update pmSDL.hpp

fix warning with win32

* update dirent for win32

* libs required for win32 linkage

* Update pmSDL.hpp

SDL_MAIN_HANDLED

* Update ShaderEngine.cpp

init glew to create shaders

* fake SDL audio with win32

* Update Renderer.vcxproj

use wildcards for source filenames

* Create config.h

* Update Expr.cpp

fix win32 breaks

* cleanup broken max function

* Update Makefile.am

remove ref to win32-dirent
2019-03-22 08:55:35 +01:00
35f79c4e5a Merge pull request #123 from projectM-visualizer/gles_fixes
DX to openGL/openGLES transpilation fixes
2018-11-23 12:27:57 +01:00
da470d6e10 - Matrix assignment: DX to GL adaptation
- GLES fix
2018-11-20 20:34:36 +01:00
5875b012ca DX to openGL/openGLES transpilation fixes 2018-11-17 13:13:25 +01:00
9b9e08badb Build warnings cleanup 2018-11-17 11:42:28 +01:00
8785481323 Fix unlock FPS flag
Add comments for test flags
2018-08-25 20:19:10 +02:00
92ce63956c Fix native presets 2018-08-22 21:20:13 +02:00
c0ff137cb4 Fix texture management 2018-08-22 20:07:11 +02:00
0c62095977 Add a fast preset switching test flag to check for shader compilation issues 2018-08-21 19:27:40 +02:00
8717520016 Downgrade glsl required version to 3.3 supported by OGL 3.3.
It's for old hardware compatiblity since OGL 4.x features are not used.
2018-07-28 19:56:46 +02:00
990c99d105 - Fix for travis
- Convert glProgramUniform* for OGL 3.x compatibility
2018-07-25 19:38:17 +02:00
99dccdf101 Blur shaders ported to GLSL
All presets unifoms corrected
Shader rendering fixed
2018-07-23 08:07:14 +02:00
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
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
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
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
3cad9c3b85 WIP preset shader loading 2018-06-10 18:00:54 +03:00
dacf7582b8 checkpoint 2018-06-10 17:27:02 +03:00
3511da0939 Merging GLES3 changes in 2018-06-10 16:59:12 +03: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
ad2acbf21b Downgrade shaders to glsl 1.3 2018-06-09 14:19:46 +02: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
7614c28368 OpenGL ES 3.0 support 2018-06-06 20:25:31 +02:00
453b9e9767 WIP I don't know what I'm doing lol help 2018-06-03 15:05:59 +02:00
02e29f50c2 lot more modernization work I have no idea if it's correct lol 2018-06-02 21:24:11 +02:00
37af98c402 cleanup 2018-06-02 17:10:22 +02:00
3c1306e82f (basic) shaders compiling 2018-06-02 16:52:15 +02:00
c30c6f680f start of GL3/GLES modernization 2018-06-02 16:09:01 +02:00
c41007bfcf not quite working HLSL->GLSL translation... has some issues 2018-05-28 00:41:52 +03:00
78058b95e7 Merge branch 'master' into glsl
Merge master + work on HLSL->GLSL transpilation
2018-05-27 22:17:07 +03:00
88d8c3174c track shader filenames so we know where the shader compilation errors come from 2018-04-08 11:43:26 -07:00
4ce4a14155 fixing cg/shaders for dev run of SDL app 2018-04-08 10:56:48 -07:00
2f155d28b8 shader load path for debug 2018-04-08 10:45:22 -07:00
a00facf3d2 can build libprojectM with xcode now 2018-04-08 08:57:03 -07:00
0bdecc03e0 Cg support again 2018-04-06 13:58:56 -07:00
0732b62374 ditching Cg, sort of hooking up GL shaders 2017-10-01 12:10:01 -07:00
668f9935aa fixes
fixed a bug causing a crash with PerlinNoise/ShaderEngine.cpp :: calling projectM::projectM_resetGL() applies the new dimensions to the window width/height in the settings :: modified the parser to return an error rather than abort and terminate the process to prevent a crash with the provided sample presets
2016-05-17 07:23:52 -04:00