Skip to content

Bugfixes by yoyofr (shader-related) #922

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.

Sign up for GitHub

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

Merged
merged 2 commits into from
Nov 3, 2025
+11 −8
Merged

Bugfixes by yoyofr (shader-related) #922

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7050626
Add additional alternates for the mult() function with int as arguments
yoyofr Nov 2, 2025
48ad458
Fix values for bass/middle/treble/volume params for shaders
yoyofr Nov 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions src/libprojectM/MilkdropPreset/MilkdropShader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,14 +186,14 @@ void MilkdropShader::LoadVariables(const PresetState& presetState, const PerFram
presetState.renderContext.fps,
presetState.renderContext.frame,
presetState.renderContext.progress});
m_shader.SetUniformFloat4("_c3", {presetState.audioData.bass / 100,
presetState.audioData.mid / 100,
presetState.audioData.treb / 100,
presetState.audioData.vol / 100});
m_shader.SetUniformFloat4("_c4", {presetState.audioData.bassAtt / 100,
presetState.audioData.midAtt / 100,
presetState.audioData.trebAtt / 100,
presetState.audioData.volAtt / 100});
m_shader.SetUniformFloat4("_c3", {presetState.audioData.bass,
presetState.audioData.mid,
presetState.audioData.treb,
presetState.audioData.vol});
m_shader.SetUniformFloat4("_c4", {presetState.audioData.bassAtt,
presetState.audioData.midAtt,
presetState.audioData.trebAtt,
presetState.audioData.volAtt});
m_shader.SetUniformFloat4("_c5", {blurMax[0] - blurMin[0],
blurMin[0],
blurMax[1] - blurMin[1],
Expand Down
3 changes: 3 additions & 0 deletions vendor/hlslparser/src/GLSLGenerator.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -426,6 +426,9 @@ bool GLSLGenerator::Generate(HLSLTree* tree, Target target, Version version, con

if (m_options.flags & Flag_AlternateNanPropagation) {
/* Implement alternate functions that propagate NaNs like shader model 3 and DX9. */
m_writer.WriteLine(0, "float %s(int i_x, int i_y) { float x=float(i_x); float y=float(i_y); if (x == 0.0 || y == 0.0) { return 0.0; } else { return (x * y); } }", m_altMultFunction);
m_writer.WriteLine(0, "float %s(int i_x, float y) { float x=float(i_x); if (x == 0.0 || y == 0.0) { return 0.0; } else { return (x * y); } }", m_altMultFunction);
m_writer.WriteLine(0, "float %s(float x, int i_y) { float y=float(i_y); if (x == 0.0 || y == 0.0) { return 0.0; } else { return (x * y); } }", m_altMultFunction);
m_writer.WriteLine(0, "float %s(float x, float y) { if (x == 0.0 || y == 0.0) { return 0.0; } else { return (x * y); } }", m_altMultFunction);
m_writer.WriteLine(0, "vec2 %s(vec2 x, vec2 y) { return vec2(%s(x.x, y.x), %s(x.y, y.y)); }", m_altMultFunction, m_altMultFunction, m_altMultFunction);
m_writer.WriteLine(0, "vec3 %s(vec3 x, vec3 y) { return vec3(%s(x.x, y.x), %s(x.y, y.y), %s(x.z, y.z)); }", m_altMultFunction, m_altMultFunction, m_altMultFunction, m_altMultFunction);
Expand Down
Loading