[gtk/matthiasc/glshader-node] gsk: Make uniform regex more forgiving

[Matthias Clasen <matthiasc src gnome org>]

commit a580c711e5a2fb3c95465a13ffb4375dc49aca4b
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Sep 23 17:48:35 2020 -0400

    gsk: Make uniform regex more forgiving
    
    Accept comments after a uniform declaration - the
    very first shader example I tried had these, so we
    better support it.

 gsk/gskglshader.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
---
diff --git a/gsk/gskglshader.c b/gsk/gskglshader.c
index 2a2f96d9e8..38f2205218 100644
--- a/gsk/gskglshader.c
+++ b/gsk/gskglshader.c
@@ -393,8 +393,9 @@ gsk_gl_shader_constructed (GObject *object)
 #define UNIFORM_TYPE_RE "(int|uint|bool|float|vec2|vec3|vec4|sampler2D)"
 #define UNIFORM_NAME_RE "([\\w]+)"
 #define OPT_INIT_VALUE_RE "[\\w(),. ]+" // This is a bit simple, but will match most initializers
+#define OPT_COMMENT_RE "(//.*)?"
 #define OPT_INITIALIZER_RE  "(" OPT_SPACE_RE "=" OPT_SPACE_RE  OPT_INIT_VALUE_RE ")?"
-#define UNIFORM_MATCHER_RE "^uniform" SPACE_RE UNIFORM_TYPE_RE SPACE_RE UNIFORM_NAME_RE OPT_INITIALIZER_RE 
OPT_SPACE_RE ";" OPT_SPACE_RE "$"
+#define UNIFORM_MATCHER_RE "^uniform" SPACE_RE UNIFORM_TYPE_RE SPACE_RE UNIFORM_NAME_RE OPT_INITIALIZER_RE 
OPT_SPACE_RE ";" OPT_SPACE_RE OPT_COMMENT_RE "$"
 
 static void
 gsk_gl_shader_class_init (GskGLShaderClass *klass)