github.com/projectM-visualizer/projectm commits

Merging GLES3 changes in

c2c00a1e1aa52b1fc42c1adaa33bbaacca016fb2 authored over 6 years ago

Merge pull request #70 from projectM-visualizer/gles3

GLES3

1cacdd67996e3cb0a96bf295bb1558ba76027702 authored over 6 years ago

gles not enabled by default

6cdba2c68ef40ed5ca56f9d5a9394f0de2498780 authored over 6 years ago

Merge branch 'gles3' of https://github.com/projectM-visualizer/projectm into gles3

ec7d5188a8c2a6b70849b0e2bafd98bdc619fef2 authored over 6 years ago

Restore vertex layout location

b650e2323dbc8e2072b033159fcd9f0186f11477 authored over 6 years ago

fix undefined VAO error

47084821da372b133a03790547e7345aa6bf151f authored over 6 years ago

progress - glsl 410

269181d9d9a5a8d86c974f6bfdcdfe40d2bb0bd2 authored over 6 years ago

Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3

0e60b1d6cb8e56c736972aaff2b2f6ccf7152fec authored over 6 years ago

Downgrade shaders to glsl 1.3

c9fef28a8911478e34621f312a85baf950960d6d authored over 6 years ago

Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3

e529008e11c851cf4ef7d68f34548915d6af9406 authored over 6 years ago

GL 1.3 stuff

44bcae39b8ff7f545e709c5856fb33a2eaf64252 authored over 6 years ago

SDL GL

0054ddbe09a209186e9ab936aaed31d6c9ac8ea2 authored over 6 years ago

SDL GL

dbceb48a653eff4641ac6bb09ecf66c3781a68f6 authored over 6 years ago

Disabling FTGL and Cg

18b0efce7a150486d35730fb27b03c92be8000b4 authored over 6 years ago

Merge branch 'gles3' of github.com:projectM-visualizer/projectm into gles3

caf71b3ab493ecaf12204d2711fce31ce84ee7a3 authored over 6 years ago

C++11 nullptr to NULL

C++11 lambda conversion

d89114c1687a93ecf54fb1a4e99be2a87cfe2c09 authored over 6 years ago

Merge pull request #69 from deltaoscarmike/gles3

OpenGL ES 3.0 support

fdbfb1e7baafd74a3811fe32030f6721ec3c8f5a authored over 6 years ago

FTGL doesn't support modern OpenGL: disabling

d3128c2c633cf2c0baa8442b6be2e8f0f2b8ee6c authored over 6 years ago

Move optional gl32.h which is only used for GL debug

717eb357499e7ee2476bf8202642a80a6a122ec8 authored over 6 years ago

Forgot to add libglm...again

c2b70915dd4879881466650cea198aded8015b55 authored over 6 years ago

Fix glm presence checking by autotools

88665e749551160f7d5b0d075a4ee230195cfcec authored over 6 years ago

Merge pull request #68 from deltaoscarmike/master

FIX: crash if preset directory is empty.

46e92f41edc10e449ec1960b4134dc1cf5e87bf9 authored over 6 years ago

fixing up GL bits and pieces

b301cd8b0c25180cffa703996d61165ac563fe1e authored over 6 years ago

render/shader context

95f603b7f81919a56a585f591857498c23f1ccdd authored over 6 years ago

OpenGL ES 3.0 support

1a01c7fd0c80e2e95fc8dd1cdde66287bdd22c86 authored over 6 years ago

FIX: crash if preset directory is empty.

The crash happens in QProjectM_MainWindow::refreshHeaders which is dependent of columns count.
Co...

76601c6ff48354c6b06eafa52a4d4510bc43ce1a authored over 6 years ago

Merge pull request #67 from schnitzeltony/master

Makefile.am: Fix installation with DESTDIR set

b4279c24f7b26ef3ab36c7f9b457b265551f48d9 authored over 6 years ago

Makefile.am: Fix installation with DESTDIR set

Signed-off-by: Andreas Müller <[email protected]>

7d414b93a97081e2b80c1ba406114c0e6fe0c769 authored over 6 years ago

Merge branch 'master' into gl-modernize

4eb2852af8659da627e7b341eee7f396caa4b75b authored over 6 years ago

copying this into master to make diffing easier

b91078e311689c5ba5e93db1323c2899b3b134d1 authored over 6 years ago

WIP I don't know what I'm doing lol help

863fe4c3643a57c18c9af5916eebd678c9b47ab4 authored over 6 years ago

lot more modernization work I have no idea if it's correct lol

9a6d4db43f327323f72bea769b360914b7cbb44f authored over 6 years ago

cleanup

b91100782a35d8ac430d7bc04f2d91e61f9964bf authored over 6 years ago

(basic) shaders compiling

a9ca405b72d05b48832287d14d58442fba4afa12 authored over 6 years ago

start of GL3/GLES modernization

dc06f9a7d78e8f8c5c327e4dc48489484f3c2f7a authored over 6 years ago

Merge pull request #65 from mbellew/issue_64

fix for issue 64

c4d4410045340349f2b3cefd4cda65fba9539f0f authored over 6 years ago

WIP

4b2ba9513b2700b4d0a7d11ba16c6f626dbe46c0 authored over 6 years ago

fix for issue 64

d2d2007366d9f91f2f43372d791da234ad1068a3 authored over 6 years ago

not quite working HLSL->GLSL translation... has some issues

b03fb81711e3e3bd769a143ae10547f8eb2b01b8 authored over 6 years ago

files I did not mean to commit

7ced2f3ce77aee8232fbceb23bcc48a31df69d6f authored over 6 years ago

files I did not mean to commit

c320816ec93c89038e071f47b8f2920c45658574 authored over 6 years ago

remove this

b12522cabb689c9cf33156c40a9009ffa653e67c authored over 6 years ago

files I did not mean to commit

501598deec788ee3c78d2af613e85db8d0390d36 authored over 6 years ago

Merge branch 'master' into glsl

Merge master + work on HLSL->GLSL transpilation

376699dfc4734d0559269a71915120bd5d726d94 authored over 6 years ago

Merge pull request #62 from mbellew/sse

SSE version of PresetOutputs::PerPixelMath

5c66e0812319496732d0eda100671b4cf25a3e14 authored over 6 years ago

fix signature for _mm_sincosf(), thanks Mischa

58722d1fc5f72b117b4e9fff53b9c7606c345f6d authored over 6 years ago

AC_CHECK_FUNCS_ONCE

9b8a9a4f06044223eed39e50e0967cd1afaf0dd7 authored over 6 years ago

__APPLE__

8b84c0f9113a4eb20e0c5fb12c713f0e5d937d1f authored over 6 years ago

TARGET_OS_MAC

108b6b013ff53ff3e3589a022b17350aa27e001c authored over 6 years ago

some comments

7fee1b6632049cf19527c3c4f9aca6660853462a authored over 6 years ago

alloc mesh as one memory block

845cb86e029ae92a0b8ee16cdfa15589c497b1f6 authored over 6 years ago

Merge pull request #61 from mbellew/parameterexpr_cleanup

ParameterExpr cleanup

834408bf03833bd065fcc360525d7a1aa9bf4e48 authored over 6 years ago

move matrix_flag check back to eval time

a9874619a64f2809cae68c50ba8bf287a27a26e3 authored over 6 years ago

fix responsiveness of SDL app

0650aa11d26f2033e47c72748a843b432667b51f authored over 6 years ago

cleanup

5c38e9c5ec0fab65e36f19c8891c7636258a1b81 authored over 6 years ago

unused member pcmBuffer

2bb6da1dd46a337ddd8609ea5fbe7e624ba13442 authored over 6 years ago

SSE version of PresetOutputs::PerPixelMath()

456ef6e2f5ef5fdb8e91c2e24b36db806b76ec18 authored over 6 years ago

Merge pull request #2 from projectM-visualizer/master

from main repo

547e5cb34c545a8c446459592e12ea57fa86b76f authored over 6 years ago

Merge pull request #60 from mbellew/sdl_crash_on_quit

fix segfault on app close

595bb28b6c3fbb104a4af21607b20c176b283b89 authored over 6 years ago

fix segfault on app close

9b8215386ba5b377472e3ce2997dfe392605ffea authored over 6 years ago

Merge pull request #59 from mbellew/eval_perf

Expression evaluation performance

e2bce59bfc690608ceef70b4313f8d76f423317b authored over 6 years ago

NULL check

66db7ade788879da6996fcb4edc564f2987c4361 authored over 6 years ago

typo

439a4f161a78ba91e7d010d517ce5ca887bcfeb5 authored over 6 years ago

TreeExprMult

10b0a4d9a4ac9bf90274fc5cc138e4f8fd672e35 authored over 6 years ago

PrefunExprOne

f4a29d54fe6a2156dde2988b9e79aeda782171a6 authored over 6 years ago

ExprClass and some warning cleanup

f5e83537f73143ebb3eefc6282552810066caaf8 authored over 6 years ago

optimize()

96a76ad1edb7628a856ab08825367395c6ae03d2 authored over 6 years ago

kill GenExpr

2f8c3b6b7cc6202b250a68b30c1d6627b21adf2e authored over 6 years ago

virtual Expr::eval()

6e4363d14624b63fc07bd42716a9c78bae5ef5bd authored over 6 years ago

remove bogus readme

d98efea27ae2d20e57bbb60022c03a8922b6bd60 authored over 6 years ago

Merge pull request #57 from projectM-visualizer/pkgconfig

pkg-config from @schnitzeltony

84eac206b1c4cebcb6c9b908bba9a1537520707f authored over 6 years ago

update tests to look for headers in libprojectM/...

d6c99b0a238ce0dda7644e499f2d64b3a3d60b6c authored over 6 years ago

Merge branch 'pkgconfig' of github.com:projectM-visualizer/projectm into pkgconfig

83218ee85c2a05ee9a861904dd9b40fcfca32933 authored over 6 years ago

Merge pull request #54 from schnitzeltony/master

Autotools pkgconfig

5c13056d31b24042d878fb24f33f155cd4b359cd authored over 6 years ago

Merge pull request #56 from deltaoscarmike/master

Fix typo

9c98ba3e070e74d2bd745a0a8171003b3e0629f5 authored over 6 years ago

Fix typo

85c799c60ccb6dcc40886bbb66c47c5e8b0697aa authored over 6 years ago

Install headers to /usr/include/libprojectM

That is where the were before switching to autotools and where projects expect
them.

Signed-off...

f0ce9c726942c7d8c1c4ff59860291345bc1ac4c authored almost 7 years ago

Re-add pkg-config support

Give others - e.g qmmp the chance to find projectM

Signed-off-by: Andreas Müller <schnitzeltony...

85f6d954b28a8e416b0c82336ca08985ae98ad47 authored almost 7 years ago

Merge pull request #53 from walshbp/install_headers

install additional headers needed to compile against libprojectm

9f8387cbfb882f908c81e9d4a441806728a73f44 authored almost 7 years ago

do not install config.h. Remove config.h from Common.hpp

1b30a59075fe3fc0fed2f524942aec51daf71b69 authored almost 7 years ago

install additional headers needed to compile against libprojectm

02d8e0e377c73e6d12e1bc97b748bd5e9b408774 authored almost 7 years ago

readme update

82c22c36f5d3099309296dab0406cc0cd1aab0ac authored almost 7 years ago

Merge pull request #52 from projectM-visualizer/pthreads

Re-enable threading

77141bf4f1b44a7be303e83a820cb3c174e4b6c2 authored almost 7 years ago

Merge pull request #50 from projectM-visualizer/xcode

Config file / xcode

2e67f128eb7e889e8ff04021172e219b03e47228 authored almost 7 years ago

try adding pthreads CFLAGS

8854e27e91bf885b0ddabef992438f730fc7d4b0 authored almost 7 years ago

debugging

4120d0455913f85b42e481ce7a3b3460a68c8d75 authored almost 7 years ago

trying to get LIBS right

432da1cf193eb9eaa2f229e717c6827616c5fedd authored almost 7 years ago

bleh

38c7716cdfebd48f8ed66c7ee86280489809763c authored almost 7 years ago

threading enabled

3ea353f3b2f2c34d58bb8f0d8343080dfd70106f authored almost 7 years ago

moving threading

27056353bc9dd7e2519abc69fc65def69903fa6a authored almost 7 years ago

pthreads

b4d9270568e282522cd4e9677d5b21639d644f56 authored almost 7 years ago

moving threading to diff branch

18b24a849d34379ec9fe8164a39b62e0aecccac4 authored almost 7 years ago

use version macro

55cf2f24d7806a69afa87734b63f42c617fac8dc authored almost 7 years ago

deal with old sdl that doesn't have SDL_GetDisplayUsableBounds(0, &initialWindowBounds);

a4ead567fa7ede3de288af32dce92df119bb0f67 authored almost 7 years ago

multithreading, bump up mesh size in config

c799f7915b3220f380fbe1dc636acdef989c3312 authored almost 7 years ago

make DATADIR_PATH accessible from our CFLAGS

b68aa8085e8c45fe47dd43c0fcc13ebd8927ab13 authored almost 7 years ago

fix shadowing width/height on resize

fc5451076c33f4c959fa9471c91c8f9a4fbcbd27 authored almost 7 years ago

track shader filenames so we know where the shader compilation errors come from

4b5f671775b7f82925edd78594ae0d8bcc7efca2 authored almost 7 years ago

bump version

cba5094f9fed10d9d47a96f2a6a171125020db2e authored almost 7 years ago

fixing cg/shaders for dev run of SDL app

820e40053f8f97598dd8331202070e6d68c23669 authored almost 7 years ago

Ecosyste.ms: OpenCollective

github.com/projectM-visualizer/projectm