From 58df48655cea22fc68f7075ea13129653fb520ec Mon Sep 17 00:00:00 2001 From: Jakub Valtar Date: Fri, 6 Jan 2017 21:45:53 +0100 Subject: [PATCH] Fix typo in glsl preprocessor Add missing 2D which disappeared in https://github.com/processing/processing/pull/4052/files#diff-88c7dd4e8f37672d20e228a71a433a6dL1889 --- core/src/processing/opengl/PGL.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java index e628b5960..72d6c2ef7 100644 --- a/core/src/processing/opengl/PGL.java +++ b/core/src/processing/opengl/PGL.java @@ -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",