Skip to content

Refactor blend mode parsing and improve error handling #3264

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

Open
Spagles wants to merge 3 commits into
base: 26.1
Choose a base branch
from
+29 −4
Open

Refactor blend mode parsing and improve error handling #3264

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5840d5f
Refactor blend mode parsing to handle variable-length mode arrays
Spagles Jul 30, 2026
3567266
Improve error handling in compute work group setters for ivec3 and ve…
Spagles Jul 30, 2026
61cd5e9
Enhance error handling for vec2, ivec3, and vec4 constructors in Disp…
Spagles Jul 30, 2026
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
6 changes: 6 additions & 0 deletions common/src/main/java/net/irisshaders/iris/shaderpack/parsing/ComputeDirectiveParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,14 @@ public class ComputeDirectiveParser {
public static void setComputeWorkGroups(ComputeSource source, ConstDirectiveParser.ConstDirective directive) {
if (!directive.getValue().startsWith("ivec3")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid ivec3 constructor");
return;
}

String ivec3Args = directive.getValue().substring("ivec3".length()).trim();

if (!ivec3Args.startsWith("(") || !ivec3Args.endsWith(")")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid ivec3 constructor");
return;
}

ivec3Args = ivec3Args.substring(1, ivec3Args.length() - 1);
Expand All @@ -28,6 +30,7 @@ public static void setComputeWorkGroups(ComputeSource source, ConstDirectivePars
if (parts.length != 3) {
Iris.logger.error("Failed to process " + directive +
": expected 3 arguments to a ivec3 constructor, got " + parts.length);
return;
}

try {
Expand All @@ -43,12 +46,14 @@ public static void setComputeWorkGroups(ComputeSource source, ConstDirectivePars
public static void setComputeWorkGroupsRelative(ComputeSource source, ConstDirectiveParser.ConstDirective directive) {
if (!directive.getValue().startsWith("vec2")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec2 constructor");
return;
}

String vec2Args = directive.getValue().substring("vec2".length()).trim();

if (!vec2Args.startsWith("(") || !vec2Args.endsWith(")")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec2 constructor");
return;
}

vec2Args = vec2Args.substring(1, vec2Args.length() - 1);
Expand All @@ -62,6 +67,7 @@ public static void setComputeWorkGroupsRelative(ComputeSource source, ConstDirec
if (parts.length != 2) {
Iris.logger.error("Failed to process " + directive +
": expected 2 arguments to a vec2 constructor, got " + parts.length);
return;
}

try {
Expand Down
9 changes: 9 additions & 0 deletions common/src/main/java/net/irisshaders/iris/shaderpack/parsing/DispatchingDirectiveHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,12 +119,14 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (consumer != null) {
if (!value.startsWith("vec2")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec2 constructor");
return;
}

String vec2Args = value.substring("vec2".length()).trim();

if (!vec2Args.startsWith("(") || !vec2Args.endsWith(")")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec2 constructor");
return;
}

vec2Args = vec2Args.substring(1, vec2Args.length() - 1);
Expand All @@ -138,6 +140,7 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (parts.length != 2) {
Iris.logger.error("Failed to process " + directive +
": expected 2 arguments to a vec2 constructor, got " + parts.length);
return;
}

try {
Expand All @@ -162,12 +165,14 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (consumer != null) {
if (!value.startsWith("ivec3")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid ivec3 constructor");
return;
}

String ivec3Args = value.substring("ivec3".length()).trim();

if (!ivec3Args.startsWith("(") || !ivec3Args.endsWith(")")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid ivec3 constructor");
return;
}

ivec3Args = ivec3Args.substring(1, ivec3Args.length() - 1);
Expand All @@ -181,6 +186,7 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (parts.length != 3) {
Iris.logger.error("Failed to process " + directive +
": expected 3 arguments to a ivec3 constructor, got " + parts.length);
return;
}

try {
Expand All @@ -206,12 +212,14 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (consumer != null) {
if (!value.startsWith("vec4")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec4 constructor");
return;
}

String vec4Args = value.substring("vec4".length()).trim();

if (!vec4Args.startsWith("(") || !vec4Args.endsWith(")")) {
Iris.logger.error("Failed to process " + directive + ": value was not a valid vec4 constructor");
return;
}

vec4Args = vec4Args.substring(1, vec4Args.length() - 1);
Expand All @@ -225,6 +233,7 @@ public void processDirective(ConstDirectiveParser.ConstDirective directive) {
if (parts.length != 4) {
Iris.logger.error("Failed to process " + directive +
": expected 4 arguments to a vec4 constructor, got " + parts.length);
return;
}

try {
Expand Down
18 changes: 14 additions & 4 deletions common/src/main/java/net/irisshaders/iris/shaderpack/properties/ShaderProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,7 +340,7 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
return;
}

String[] modeArray = value.split(" ");
String[] modeArray = value.trim().split("\\s+");
int[] modes = new int[modeArray.length];

int i = 0;
Expand All @@ -349,7 +349,12 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
i++;
}

bufferBlendOverrides.computeIfAbsent(parts[0], list -> new ArrayList<>()).add(new BufferBlendInformation(index, new BlendMode(modes[0], modes[1], modes[2], modes[3])));
int srcRgb = modes[0];
int dstRgb = modes.length > 1 ? modes[1] : modes[0];
int srcAlpha = modes.length > 2 ? modes[2] : srcRgb;
int dstAlpha = modes.length > 3 ? modes[3] : dstRgb;

bufferBlendOverrides.computeIfAbsent(parts[0], list -> new ArrayList<>()).add(new BufferBlendInformation(index, new BlendMode(srcRgb, dstRgb, srcAlpha, dstAlpha)));

return;
}
Expand All @@ -359,7 +364,7 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
return;
}

String[] modeArray = value.split(" ");
String[] modeArray = value.trim().split("\\s+");
int[] modes = new int[modeArray.length];

int i = 0;
Expand All @@ -368,7 +373,12 @@ public ShaderProperties(String contents, ShaderPackOptions shaderPackOptions, It
i++;
}

blendModeOverrides.put(pass, new BlendModeOverride(new BlendMode(modes[0], modes[1], modes[2], modes[3])));
int srcRgb = modes[0];
int dstRgb = modes.length > 1 ? modes[1] : modes[0];
int srcAlpha = modes.length > 2 ? modes[2] : srcRgb;
int dstAlpha = modes.length > 3 ? modes[3] : dstRgb;

blendModeOverrides.put(pass, new BlendModeOverride(new BlendMode(srcRgb, dstRgb, srcAlpha, dstAlpha)));
});

handlePassDirective("indirect.", key, value, pass -> {
Expand Down