Vulkan: Remove accidental padding in push constants

Bug: chromium:1124379
Change-Id: I45f4511c836858c70d4dae23c7b3954e0bc65ab4
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2391616
Reviewed-by: Shahbaz Youssefi <[email protected]>
Commit-Queue: Shahbaz Youssefi <[email protected]>

Author: ShabbyX

scripts/code_generation_hashes/Vulkan_internal_shader_programs.json

@@ -92,25 +92,25 @@
   "src/libANGLE/renderer/vulkan/shaders/gen/FullScreenQuad.vert.00000000.inc":
     "3a4ab796f02d3f1c306c92f7da2c68ee",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000000.inc":
-    "f06dfe4a68246020bc3d2c1132e6bd11",
+    "4e2e1e59d32aed39be0f0ae9d6c71353",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000001.inc":
-    "86b35ef5a4f4058bc59c57157bc2a9e8",
+    "874ada3b975adcd8cdf2482df035c5c4",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000002.inc":
-    "bbf41ecbd4b7065cdc02dd91bed2b1c1",
+    "b1212f80774bbd58dd18adae991a1ca5",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000003.inc":
-    "197553fd8abfce67e5aa5abaf4fac069",
+    "357a59324a3fd8540e47b0dcfd33cfb3",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000004.inc":
-    "6173c8b287c379473195c7f2c184d682",
+    "7c7f23963a3e5b4928e05616d80fa5d9",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000005.inc":
-    "77da7b66604d76872d56d4a7e87d2e92",
+    "611fe224e3fe61293051ebd65f8faafc",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000006.inc":
-    "e151f06ebf603206191017aa902db11c",
+    "4b6575f8503ff7e81e86b347fd2c96bf",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000007.inc":
-    "10565b3877038c05d6dcfeaf31d79a78",
+    "e5ef164ca3f955ef1f66e00f3072711f",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000008.inc":
-    "4503b38c206416b27b2c5efee1229d97",
+    "98d6d99ad0084ac0e6573fb7ff2ea890",
   "src/libANGLE/renderer/vulkan/shaders/gen/GenerateMipmap.comp.00000009.inc":
-    "b6eae7691b963374795cacf6659f9a2a",
+    "a1b48c4da4ba2db858c0af03b0a9666e",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000000.inc":
     "d5a8184fad9c4a315bc3146ad07d3991",
   "src/libANGLE/renderer/vulkan/shaders/gen/ImageClear.frag.00000001.inc":
@@ -256,7 +256,7 @@
   "src/libANGLE/renderer/vulkan/shaders/src/FullScreenQuad.vert":
     "805ec8b2f87d4bd4242dc5b1c58ba3b4",
   "src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp":
-    "46ac9e6bbb1b6f2af92dcc85ba52faff",
+    "ec72e3ce787ca499c684eaa7c96bcc74",
   "src/libANGLE/renderer/vulkan/shaders/src/GenerateMipmap.comp.json":
     "99543d519f0afe66713498e5d7873871",
   "src/libANGLE/renderer/vulkan/shaders/src/ImageClear.frag":

src/libANGLE/renderer/vulkan/UtilsVk.cpp

@@ -1889,10 +1889,9 @@ angle::Result UtilsVk::generateMipmap(ContextVk *contextVk,
     const uint32_t workGroupY = UnsignedCeilDivide(srcExtents.height, kPixelWorkgroupRatio);
 
     GenerateMipmapShaderParams shaderParams;
-    shaderParams.levelCount      = params.destLevelCount;
-    shaderParams.numWorkGroups   = workGroupX * workGroupY;
     shaderParams.invSrcExtent[0] = 1.0f / srcExtents.width;
     shaderParams.invSrcExtent[1] = 1.0f / srcExtents.height;
+    shaderParams.levelCount      = params.destLevelCount;
 
     uint32_t flags = GetGenerateMipmapFlags(contextVk, src->getFormat());
 

src/libANGLE/renderer/vulkan/UtilsVk.h

@@ -384,9 +384,8 @@ class UtilsVk : angle::NonCopyable
     struct GenerateMipmapShaderParams
     {
         // Structure matching PushConstants in GenerateMipmap.comp
-        uint32_t levelCount    = 0;
-        uint32_t numWorkGroups = 0;
-        float invSrcExtent[2]  = {};
+        float invSrcExtent[2] = {};
+        uint32_t levelCount   = 0;
     };
 
     ANGLE_DISABLE_STRUCT_PADDING_WARNINGS

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

@@ -52,10 +52,10 @@ layout(set = 0, binding = 0, DST_FORMAT) uniform coherent image2D dst[DST_COUNT]
 layout(set = 0, binding = 1) uniform sampler2D src;
 
 layout(push_constant) uniform PushConstants {
-    // Number of levels to generate mipmaps for.
-    uint levelCount;
     // Inverse extents of src image for uv calculation.
     vec2 invSrcExtent;
+    // Number of levels to generate mipmaps for.
+    uint levelCount;
 } params;
 
 #define A_GPU