diff --git a/src/amd/compiler/tests/glsl_scraper.py b/src/amd/compiler/tests/glsl_scraper.py index 291b33958f4..3167d7cf614 100644 --- a/src/amd/compiler/tests/glsl_scraper.py +++ b/src/amd/compiler/tests/glsl_scraper.py @@ -28,16 +28,16 @@ stage_to_glslang_stage = { } base_layout_qualifier_id_re = r'({0}\s*=\s*(?P<{0}>\d+))' -id_re = '(?P[^(gl_)]\w+)' -type_re = '(?P\w+)' +id_re = r'(?P[^(gl_)]\w+)' +type_re = r'(?P\w+)' location_re = base_layout_qualifier_id_re.format('location') component_re = base_layout_qualifier_id_re.format('component') binding_re = base_layout_qualifier_id_re.format('binding') set_re = base_layout_qualifier_id_re.format('set') unk_re = r'\w+(=\d+)?' layout_qualifier_re = r'layout\W*\((%s)+\)' % '|'.join([location_re, binding_re, set_re, unk_re, '[, ]+']) -ubo_decl_re = 'uniform\W+%s(\W*{)?(?P)' % (id_re%0) -ssbo_decl_re = 'buffer\W+%s(\W*{)?(?P)' % (id_re%1) +ubo_decl_re = r'uniform\W+%s(\W*{)?(?P)' % (id_re%0) +ssbo_decl_re = r'buffer\W+%s(\W*{)?(?P)' % (id_re%1) image_buffer_decl_re = r'uniform\W+imageBuffer\w+%s;(?P)' % (id_re%2) image_decl_re = r'uniform\W+image\w+\W+%s;(?P)' % (id_re%3) texture_buffer_decl_re = r'uniform\W+textureBuffer\w+%s;(?P)' % (id_re%4)