Vulkan: Cleanups to shader generation script.

DEPS

@@ -15,10 +15,10 @@ vars = {
   'glslang_revision': '5efb004d59601711cdf328c8a8bfbe7f333dc7a0',
 
   # Current revision fo the SPIRV-Headers Vulkan support library.
-  'spirv_headers_revision': '8bea0a266ac9b718aa0818d9e3a47c0b77c2cb23',
+  'spirv_headers_revision': '111a25e4ae45e2b4d7c18415e1d6884712b958c4',
 
   # Current revision of SPIRV-Tools for Vulkan.
-  'spirv_tools_revision': 'fde69dcd80cc1ca548300702adf01eeb25441f3e',
+  'spirv_tools_revision': '2ac348b5c0a58c64305379baca778c2e58873cd6',
 
   # Current revision of Khronos Vulkan-Headers.
   'vulkan_headers_revision': 'c200cb25db0f47364d3318d92c1d8e9dfff2fef1',

src/libANGLE/renderer/vulkan/gen_vk_internal_shaders.py

@@ -10,6 +10,7 @@
 #  code upload please run scripts/run_code_generation.py.
 
 from datetime import date
+import io
 import json
 import os
 import re
@@ -21,7 +22,7 @@ out_file_h = 'vk_internal_shaders_autogen.h'
 out_file_gni = 'vk_internal_shaders_autogen.gni'
 
 # Templates for the generated files:
-template_shader_library_cpp = """// GENERATED FILE - DO NOT EDIT.
+template_shader_library_cpp = u"""// GENERATED FILE - DO NOT EDIT.
 // Generated by {script_name} using data from {input_file_name}
 //
 // Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
@@ -93,7 +94,7 @@ void ShaderLibrary::destroy(VkDevice device)
 }}  // namespace rx
 """
 
-template_shader_library_h = """// GENERATED FILE - DO NOT EDIT.
+template_shader_library_h = u"""// GENERATED FILE - DO NOT EDIT.
 // Generated by {script_name} using data from {input_file_name}
 //
 // Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
@@ -136,7 +137,7 @@ class ShaderLibrary final : angle::NonCopyable
 #endif  // LIBANGLE_RENDERER_VULKAN_VK_INTERNAL_SHADERS_AUTOGEN_H_
 """
 
-template_shader_includes_gni = """# GENERATED FILE - DO NOT EDIT.
+template_shader_includes_gni = u"""# GENERATED FILE - DO NOT EDIT.
 # Generated by {script_name} using data from {input_file_name}
 #
 # Copyright {copyright_year} The ANGLE Project Authors. All rights reserved.
@@ -174,14 +175,16 @@ def get_output_path(name):
 
 # Finds a path to GN's out directory
 def find_build_path(path):
-    out = os.path.join(path, "out")
+    out = os.path.join(path, 'out')
     if (os.path.isdir(out)):
-        for o in os.listdir(out):
-            subdir = os.path.join(out, o)
-            if os.path.isdir(subdir):
-                argsgn = os.path.join(subdir, "args.gn")
-                if os.path.isfile(argsgn):
-                    return subdir
+        # Prefer release directories.
+        for pattern in ['elease', '']:
+            for o in os.listdir(out):
+                subdir = os.path.join(out, o)
+                if os.path.isdir(subdir) and pattern in o:
+                    argsgn = os.path.join(subdir, "args.gn")
+                    if os.path.isfile(argsgn):
+                        return subdir
     else:
         parent = os.path.join(path, "..")
         if (os.path.isdir(parent)):
@@ -302,7 +305,7 @@ def compile_variation(glslang_path, shader_file, shader_basename, flags, enums,
             shader_text = subprocess.check_output(glslang_preprocessor_output_args)
 
             incfile.write('\n\n#if 0  // Generated from:\n')
-            incfile.write(cleanup_preprocessed_shader(shader_text))
+            incfile.write(cleanup_preprocessed_shader(shader_text.replace('\r\n', '\n')))
             incfile.write('\n#endif  // Preprocessed code\n')
 
 class ShaderAndVariations:
@@ -465,7 +468,8 @@ def main():
         for shader in os.listdir(shaders_dir)
         if any([os.path.splitext(shader)[1] == ext for ext in valid_extensions])])
     if print_inputs:
-        print(",".join(input_shaders))
+        glslang_git_head = '../../../../third_party/glslang/src/.git/HEAD'
+        print(",".join(input_shaders + [glslang_git_head]))
         sys.exit(0)
 
     # STEP 1: Call glslang to generate the internal shaders into small .inc files.
@@ -563,7 +567,7 @@ def main():
         outfile.close()
 
     # STEP 3: Create a gni file with the generated files.
-    with open(out_file_gni, 'w') as outfile:
+    with io.open(out_file_gni, 'w', newline='\n') as outfile:
         outcode = template_shader_includes_gni.format(
             script_name = __file__,
             copyright_year = date.today().year,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000000.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000000[] = {
 	0x07230203,0x00010000,0x00080007,0x0000003d,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000001.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000001[] = {
 	0x07230203,0x00010000,0x00080007,0x00000033,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000002.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000002[] = {
 	0x07230203,0x00010000,0x00080007,0x00000041,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000003.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000003[] = {
 	0x07230203,0x00010000,0x00080007,0x00000037,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000004.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000004[] = {
 	0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000005.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000005[] = {
 	0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000006.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000006[] = {
 	0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000007.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000007[] = {
 	0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000008.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000008[] = {
 	0x07230203,0x00010000,0x00080007,0x0000003c,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.00000009.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_00000009[] = {
 	0x07230203,0x00010000,0x00080007,0x00000032,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000A.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_0000000A[] = {
 	0x07230203,0x00010000,0x00080007,0x00000040,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/BufferUtils.comp.0000000B.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kBufferUtils_comp_0000000B[] = {
 	0x07230203,0x00010000,0x00080007,0x00000036,0x00000000,0x00020011,0x00000001,0x00020011,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000000.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000000[] = {
 	0x07230203,0x00010000,0x00080007,0x00000134,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000001.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000001[] = {
 	0x07230203,0x00010000,0x00080007,0x00000125,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000002.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000002[] = {
 	0x07230203,0x00010000,0x00080007,0x0000011d,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000003.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000003[] = {
 	0x07230203,0x00010000,0x00080007,0x0000010e,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000004.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000004[] = {
 	0x07230203,0x00010000,0x00080007,0x000000f4,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000005.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000005[] = {
 	0x07230203,0x00010000,0x00080007,0x000000e5,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000006.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000006[] = {
 	0x07230203,0x00010000,0x00080007,0x000000e0,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000007.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000007[] = {
 	0x07230203,0x00010000,0x00080007,0x000000d1,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000008.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000008[] = {
 	0x07230203,0x00010000,0x00080007,0x000000fe,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.00000009.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_00000009[] = {
 	0x07230203,0x00010000,0x00080007,0x000000ef,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000A.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000A[] = {
 	0x07230203,0x00010000,0x00080007,0x000000e6,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000B.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000B[] = {
 	0x07230203,0x00010000,0x00080007,0x000000d7,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000C.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000C[] = {
 	0x07230203,0x00010000,0x00080007,0x000000de,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000D.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000D[] = {
 	0x07230203,0x00010000,0x00080007,0x000000cf,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000E.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000E[] = {
 	0x07230203,0x00010000,0x00080007,0x000000d9,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ConvertVertex.comp.0000000F.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kConvertVertex_comp_0000000F[] = {
 	0x07230203,0x00010000,0x00080007,0x000000ca,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kFullScreenQuad_vert_00000000[] = {
 	0x07230203,0x00010000,0x00080007,0x00000024,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageClear_frag_00000000[] = {
 	0x07230203,0x00010000,0x00080007,0x00000012,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000000.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000000[] = {
 	0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000001.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000001[] = {
 	0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000002.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000002[] = {
 	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000003.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000003[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000004.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000004[] = {
 	0x07230203,0x00010000,0x00080007,0x00000099,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000005.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000005[] = {
 	0x07230203,0x00010000,0x00080007,0x000000a0,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000008.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000008[] = {
 	0x07230203,0x00010000,0x00080007,0x00000096,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000009.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000009[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009d,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000A.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_0000000A[] = {
 	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000B.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_0000000B[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000C.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_0000000C[] = {
 	0x07230203,0x00010000,0x00080007,0x00000097,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.0000000D.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_0000000D[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000010.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000010[] = {
 	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000011.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000011[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009f,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000012.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000012[] = {
 	0x07230203,0x00010000,0x00080007,0x00000098,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000013.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000013[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009e,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000014.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000014[] = {
 	0x07230203,0x00010000,0x00080007,0x0000009a,0x00000000,0x00020011,0x00000001,0x0006000b,

src/libANGLE/renderer/vulkan/shaders/gen/ImageCopy.frag.00000015.inc

-	// 7.11.3009
+	// 7.11.3170
 	 #pragma once
 const uint32_t kImageCopy_frag_00000015[] = {
 	0x07230203,0x00010000,0x00080007,0x000000a1,0x00000000,0x00020011,0x00000001,0x0006000b,