Skip to content

Commit 1e2c7e7

Browse files
committed
Fix: actually enable define detection
1 parent 99118ed commit 1e2c7e7

1 file changed

Lines changed: 23 additions & 23 deletions

File tree

src/main/java/net/vulkanmod/vulkan/shader/converter/GLSLParser.java

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -127,29 +127,29 @@ private void parsePreprocessor() {
127127

128128
advanceToken(true);
129129
switch (currentToken.value) {
130-
// case "define" -> {
131-
// advanceToken(true);
132-
//
133-
// this.defines.add(currentToken.value);
134-
// }
135-
// case "ifdef" -> {
136-
// advanceToken(true);
137-
//
138-
// if (!this.defines.contains(currentToken.value)) {
139-
// this.preprocessorState = PreprocessorState.IGNORE;
140-
// }
141-
// }
142-
// case "else" -> {
143-
// if (preprocessorState != PreprocessorState.IGNORE) {
144-
// preprocessorState = PreprocessorState.IGNORE;
145-
// }
146-
// else {
147-
// preprocessorState = PreprocessorState.DEFAULT;
148-
// }
149-
// }
150-
// case "endif" -> {
151-
// preprocessorState = PreprocessorState.DEFAULT;
152-
// }
130+
case "define" -> {
131+
advanceToken(true);
132+
133+
this.defines.add(currentToken.value);
134+
}
135+
case "ifdef" -> {
136+
advanceToken(true);
137+
138+
if (!this.defines.contains(currentToken.value)) {
139+
this.preprocessorState = PreprocessorState.IGNORE;
140+
}
141+
}
142+
case "else" -> {
143+
if (preprocessorState != PreprocessorState.IGNORE) {
144+
preprocessorState = PreprocessorState.IGNORE;
145+
}
146+
else {
147+
preprocessorState = PreprocessorState.DEFAULT;
148+
}
149+
}
150+
case "endif" -> {
151+
preprocessorState = PreprocessorState.DEFAULT;
152+
}
153153
case "line" -> {
154154
appendTokens = false;
155155
}

0 commit comments

Comments
 (0)