Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support for new WaveformData struct in shaders #13474

Merged

Conversation

acolombier
Copy link
Member

Fixes #13472

As part of the newly introduce Waveform-6.0 format, the waveform data now allocates space for stem information. This PR fixes the rendering issues with shaders, by offsetting the waveform data.

Going forward, we may consider add some more advanced logic to use the stem data if available, but this will require feeding more attribute to GLSL, such as stem gain.

@daschuer @ywwg would appreciate a test if you can :)

@ywwg
Copy link
Member

ywwg commented Jul 15, 2024

this does fix the offset / half-waveform issue, but it does not fix the crash when changing preferences (#13471)

res/shaders/rgbsignal.frag Outdated Show resolved Hide resolved
res/shaders/filteredsignal.frag Outdated Show resolved Hide resolved
res/shaders/filteredsignal.frag Outdated Show resolved Hide resolved
res/shaders/stackedsignal.frag Outdated Show resolved Hide resolved
@acolombier
Copy link
Member Author

Thanks for the review @ywwg - sorry did that between two meetings, will grab the time to fix the comments

Note that the Wayland issue is not related to stem nor waveform changes.

@acolombier acolombier force-pushed the fix/waveform-shader-support-for-new-struct branch from 85a4e2f to 717b633 Compare July 15, 2024 17:08
@acolombier
Copy link
Member Author

@ywwg I amended the commit - feel free to merge when ready :)

@ywwg ywwg merged commit fe878b9 into mixxxdj:main Jul 15, 2024
13 checks passed
@acolombier acolombier deleted the fix/waveform-shader-support-for-new-struct branch July 15, 2024 18:33
@ywwg
Copy link
Member

ywwg commented Jul 16, 2024

hmm it looks like this didn't actually work right, it seems to be off by a factor of 2 by length. This makes it seem to line up with the beat grid, but if you fast forward to the end of the track, it doesn't

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Waveform issues with "High details" enabled
2 participants