eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-06-16 04:26:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4816 from JakubValtar/fix-glsl-typo

Browse Source 
Fix typo in glsl preprocessor
This commit is contained in:
Ben Fry
2017-01-06 16:10:10 -05:00
committed by GitHub
parent fd3bbd5a6b 58df48655c
commit 20d716009c
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
core/src/processing/opengl/PGL.java
+2 -2
View File
@@ -1914,7 +1914,7 @@ public abstract class PGL {
Pattern[] search = new Pattern[] {
Pattern.compile(String.format(GLSL_ID_REGEX, "varying|attribute")),
Pattern.compile(String.format(GLSL_ID_REGEX, "texture")),
Pattern.compile(String.format(GLSL_FN_REGEX, "textureRect|texture2D|texture3D|textureCube")),
Pattern.compile(String.format(GLSL_FN_REGEX, "texture2DRect|texture2D|texture3D|textureCube")),
Pattern.compile(String.format(GLSL_ID_REGEX, "gl_FragColor"))
};
String[] replace = new String[] {
@@ -1954,7 +1954,7 @@ public abstract class PGL {
Pattern.compile(String.format(GLSL_ID_REGEX, "varying")),
Pattern.compile(String.format(GLSL_ID_REGEX, "attribute")),
Pattern.compile(String.format(GLSL_ID_REGEX, "texture")),
Pattern.compile(String.format(GLSL_FN_REGEX, "textureRect|texture2D|texture3D|textureCube"))
Pattern.compile(String.format(GLSL_FN_REGEX, "texture2DRect|texture2D|texture3D|textureCube"))
};
String[] replace = new String[] {
"out", "in", "texMap", "texture",