From aeca59d9abe91adfeb0fa052976b7b65af60055f Mon Sep 17 00:00:00 2001
From: ahbejarano <ahbejarano@gmail.com>
Date: Sat, 9 Dec 2023 08:22:31 +0100
Subject: [PATCH] Second batch of changes to solve  #76

---
 bookcontents/chapter-14/chapter-14.md         | 125 ++++--------------
 bookcontents/chapter-16/chapter-16.md         |   6 +-
 .../resources/shaders/animations_comp.glsl    |  42 +++---
 .../shaders/animations_comp.glsl.spv          | Bin 9476 -> 9408 bytes
 .../org/vulkanb/eng/graph/VulkanModel.java    |   2 +-
 .../animation/AnimationComputeActivity.java   |  16 +--
 .../animation/AnimationSpecConstants.java     |  42 ------
 .../resources/shaders/animations_comp.glsl    |  42 +++---
 .../shaders/animations_comp.glsl.spv          | Bin 9476 -> 9416 bytes
 .../animation/AnimationComputeActivity.java   |  16 +--
 .../animation/AnimationSpecConstants.java     |  42 ------
 11 files changed, 76 insertions(+), 257 deletions(-)
 delete mode 100644 booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java
 delete mode 100644 booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java

diff --git a/bookcontents/chapter-14/chapter-14.md b/bookcontents/chapter-14/chapter-14.md
index 3431c6f5..52e12631 100644
--- a/bookcontents/chapter-14/chapter-14.md
+++ b/bookcontents/chapter-14/chapter-14.md
@@ -823,7 +823,6 @@ public class AnimationComputeActivity {
     // Key is the model id
     private final Map<String, ModelDescriptorSets> modelDescriptorSetsMap;
     private final Scene scene;
-    private final AnimationSpecConstants animationSpecConstants;
 
     private CommandBuffer commandBuffer;
     private ComputePipeline computePipeline;
@@ -832,13 +831,11 @@ public class AnimationComputeActivity {
     private Fence fence;
     private ShaderProgram shaderProgram;
     private DescriptorSetLayout.StorageDescriptorSetLayout storageDescriptorSetLayout;
-    private DescriptorSetLayout.UniformDescriptorSetLayout uniformDescriptorSetLayout;
 
     public AnimationComputeActivity(CommandPool commandPool, PipelineCache pipelineCache, Scene scene) {
         this.scene = scene;
         device = pipelineCache.getDevice();
         computeQueue = new Queue.ComputeQueue(device, 0);
-        animationSpecConstants = new AnimationSpecConstants();
         createDescriptorPool();
         createDescriptorSets();
         createShaders();
@@ -852,65 +849,16 @@ public class AnimationComputeActivity {
 }
 ```
 
-We create an instance of `AnimationSpecConstants` which will be used to set specialization constants. Specifically, it will hold the maximum number of joint matrices lists which will be used in the compute shader. It is defined liked this:
-
-```java
-package org.vulkanb.eng.graph.animation;
-
-import org.lwjgl.system.MemoryUtil;
-import org.lwjgl.vulkan.*;
-import org.vulkanb.eng.EngineProperties;
-import org.vulkanb.eng.graph.vk.GraphConstants;
-
-import java.nio.ByteBuffer;
-
-public class AnimationSpecConstants {
-
-    private final ByteBuffer data;
-    private final VkSpecializationMapEntry.Buffer specEntryMap;
-    private final VkSpecializationInfo specInfo;
-
-    public AnimationSpecConstants() {
-        EngineProperties engineProperties = EngineProperties.getInstance();
-        data = MemoryUtil.memAlloc(GraphConstants.INT_LENGTH);
-        data.putInt(engineProperties.getMaxJointsMatricesLists());
-        data.flip();
-
-        specEntryMap = VkSpecializationMapEntry.calloc(1);
-        specEntryMap.get(0)
-                .constantID(0)
-                .size(GraphConstants.INT_LENGTH)
-                .offset(0);
-
-        specInfo = VkSpecializationInfo.calloc();
-        specInfo.pData(data)
-                .pMapEntries(specEntryMap);
-    }
-
-    public void cleanup() {
-        MemoryUtil.memFree(specEntryMap);
-        specInfo.free();
-        MemoryUtil.memFree(data);
-    }
-
-    public VkSpecializationInfo getSpecInfo() {
-        return specInfo;
-    }
-}
-```
-
-Back to the `AnimationComputeActivity` class, in the `cleanup` method, as usual, we just free the resources:
+In the `cleanup` method, as usual, we just free the resources:
 ```java
 public class AnimationComputeActivity {
     ...
     public void cleanup() {
         computePipeline.cleanup();
-        animationSpecConstants.cleanup();
         shaderProgram.cleanup();
         commandBuffer.cleanup();
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
-        uniformDescriptorSetLayout.cleanup();
         fence.cleanup();
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
@@ -935,19 +883,17 @@ public class AnimationComputeActivity {
         int maxStorageBuffers = engineProperties.getMaxStorageBuffers();
         int maxJointsMatricesLists = engineProperties.getMaxJointsMatricesLists();
         List<DescriptorPool.DescriptorTypeCount> descriptorTypeCounts = new ArrayList<>();
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER));
+        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers + maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
         descriptorPool = new DescriptorPool(device, descriptorTypeCounts);
     }
 
     private void createDescriptorSets() {
         storageDescriptorSetLayout = new DescriptorSetLayout.StorageDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
-        uniformDescriptorSetLayout = new DescriptorSetLayout.UniformDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
         descriptorSetLayouts = new DescriptorSetLayout[]{
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
-                uniformDescriptorSetLayout,
+                storageDescriptorSetLayout,
         };
     }
 
@@ -1148,8 +1094,6 @@ The next step is to write the compute shader which performs the calculations. Th
 ```glsl
 #version 450
 
-layout (constant_id = 0) const int MAX_JOINTS = 150;
-
 layout (std430, set=0, binding=0) readonly buffer srcBuf {
     float data[];
 } srcVector;
@@ -1162,15 +1106,15 @@ layout (std430, set=2, binding=0) buffer dstBuf {
     float data[];
 } dstVector;
 
-layout (local_size_x=1, local_size_y=1, local_size_z=1) in;
+layout (std430, set=3, binding=0) readonly buffer jointBuf {
+    mat4 data[];
+} jointMatrices;
 
-layout(set = 3, binding = 0) uniform JointMatricesUniform {
-    mat4 jointMatrices[MAX_JOINTS];
-} jointMatricesUniform;
+layout (local_size_x=32, local_size_y=1, local_size_z=1) in;
 ...
 ```
 
-The `srcVector` is the storage buffer that contains binding pose data (positions, texture coordinates, normals, bitangents and tangents). It is a readonly buffer since we will not writing to it. The `weightsVector` is also a readonly buffer that contains the weights associated to each vertex. The `dstVector` is the storage buffer that will hold our results, it will contain the positions, texture coordinates, normals, bitangents and tangents transformed according to the animation. Finally, the `jointMatricesUniform`, holds the list of transformation matrices applicable to each joint for a specific frame. Going back to the shaders, the `main` method starts like this:
+The `srcVector` is the storage buffer that contains binding pose data (positions, texture coordinates, normals, bitangents and tangents). It is a readonly buffer since we will not writing to it. The `weightsVector` is also a readonly buffer that contains the weights associated to each vertex. The `dstVector` is the storage buffer that will hold our results, it will contain the positions, texture coordinates, normals, bitangents and tangents transformed according to the animation. Finally, the `jointMatrices` storage buffer, holds the list of transformation matrices applicable to each joint for a specific frame. Going back to the shaders, the `main` method starts like this:
 ```glsl
 void main()
 {
@@ -1189,38 +1133,21 @@ Now we will examine how the vertex positions are transformed:
 void main()
 {
     ...
-    int baseIdxSrcBuf = int(gl_GlobalInvocationID.x) * 14;
+     int baseIdxSrcBuf = int(gl_GlobalInvocationID.x) * 14;
     vec4 position = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 1);
     position =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * position +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * position +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * position +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * position;
+    weights.x * jointMatrices.data[joints.x] * position +
+    weights.y * jointMatrices.data[joints.y] * position +
+    weights.z * jointMatrices.data[joints.z] * position +
+    weights.w * jointMatrices.data[joints.w] * position;
     dstVector.data[baseIdxSrcBuf] = position.x / position.w;
     dstVector.data[baseIdxSrcBuf + 1] = position.y / position.w;
     dstVector.data[baseIdxSrcBuf + 2] = position.z / position.w;
-    ...
+   ...
 }
 ```
 
 After that, we get the vertex positions form the storage buffer that contains the vertex data for the bind position. That buffer can be split into slices of 14 floats: 3 floats for vertex positions, 3 for normal coordinates, 3 for tangent coordinates, 3 for bitangent coordinates and 2 for texture coordinates. Once we get the vertex position, we modify those coordinates by applying a modulation factor which is derived from multiplying the weight factor by the joint transformation matrix of the associated matrix.
-```glsl
-void main()
-{
-    ...
-    int baseIdxSrcBuf = int(gl_GlobalInvocationID.x) * 14;
-    vec4 position = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 1);
-    position =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * position +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * position +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * position +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * position;
-    dstVector.data[baseIdxSrcBuf] = position.x / position.w;
-    dstVector.data[baseIdxSrcBuf + 1] = position.y / position.w;
-    dstVector.data[baseIdxSrcBuf + 2] = position.z / position.w;
-    ...
-}
-```
 
 The same process is applied to the normal, tangent and bitangent.
 ```glsl
@@ -1230,10 +1157,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 normal = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     normal =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * normal +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * normal +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * normal +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * normal;
+    weights.x * jointMatrices.data[joints.x] * normal +
+    weights.y * jointMatrices.data[joints.y] * normal +
+    weights.z * jointMatrices.data[joints.z] * normal +
+    weights.w * jointMatrices.data[joints.w] * normal;
     dstVector.data[baseIdxSrcBuf] = normal.x / normal.w;
     dstVector.data[baseIdxSrcBuf + 1] = normal.y / normal.w;
     dstVector.data[baseIdxSrcBuf + 2] = normal.z / normal.w;
@@ -1241,10 +1168,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 tangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     tangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * tangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * tangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * tangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * tangent;
+    weights.x * jointMatrices.data[joints.x] * tangent +
+    weights.y * jointMatrices.data[joints.y] * tangent +
+    weights.z * jointMatrices.data[joints.z] * tangent +
+    weights.w * jointMatrices.data[joints.w] * tangent;
     dstVector.data[baseIdxSrcBuf] = tangent.x / tangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = tangent.y / tangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = tangent.z / tangent.w;
@@ -1252,10 +1179,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 bitangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     bitangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * bitangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * bitangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * bitangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * bitangent;
+    weights.x * jointMatrices.data[joints.x] * bitangent +
+    weights.y * jointMatrices.data[joints.y] * bitangent +
+    weights.z * jointMatrices.data[joints.z] * bitangent +
+    weights.w * jointMatrices.data[joints.w] * bitangent;
     dstVector.data[baseIdxSrcBuf] = bitangent.x / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = bitangent.y / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = bitangent.z / bitangent.w;
diff --git a/bookcontents/chapter-16/chapter-16.md b/bookcontents/chapter-16/chapter-16.md
index 315a8d76..d9e7e80a 100644
--- a/bookcontents/chapter-16/chapter-16.md
+++ b/bookcontents/chapter-16/chapter-16.md
@@ -1905,7 +1905,7 @@ public class AnimationComputeActivity {
     ...
 }
 ```
-Instead of having multiple descriptor sets and buffers per model, we will have all that data in combined storage buffers. Therefore, we need to create the new descriptor sets for them, as storage descriptor sets. We will not need also specialization constants since everything will by handled by storage buffers (no more uniforms). Those descriptor sets are created when the animated entities are loaded. This will be done in the `onAnimatedEntitiesLoaded` which will be called from the `Render` instance.
+Instead of having multiple descriptor sets and buffers per model, we will have all that data in combined storage buffers. Therefore, we need to create the new descriptor sets for them, as storage descriptor sets. Those descriptor sets are created when the animated entities are loaded. This will be done in the `onAnimatedEntitiesLoaded` which will be called from the `Render` instance.
 ```java
 public class AnimationComputeActivity {
     ...
@@ -1983,10 +1983,6 @@ public class AnimationComputeActivity {
 In order to access the proper offset in the global buffers, we pass all that information through a push constant structure. This is used in the compute shader which calculates the animations and dumps the results into a buffer.
 ```glsl
 ...
-layout (std430, set=3, binding=0) readonly buffer jointBuf {
-    mat4 data[];
-} jointMatrices;
-...
 layout(push_constant) uniform pushConstants {
     uint srcOffset;
     uint srcSize;
diff --git a/booksamples/chapter-14/resources/shaders/animations_comp.glsl b/booksamples/chapter-14/resources/shaders/animations_comp.glsl
index 20a9550b..1385cd15 100644
--- a/booksamples/chapter-14/resources/shaders/animations_comp.glsl
+++ b/booksamples/chapter-14/resources/shaders/animations_comp.glsl
@@ -1,7 +1,5 @@
 #version 450
 
-layout (constant_id = 0) const int MAX_JOINTS = 150;
-
 layout (std430, set=0, binding=0) readonly buffer srcBuf {
     float data[];
 } srcVector;
@@ -14,11 +12,11 @@ layout (std430, set=2, binding=0) buffer dstBuf {
     float data[];
 } dstVector;
 
-layout (local_size_x=32, local_size_y=1, local_size_z=1) in;
+layout (std430, set=3, binding=0) readonly buffer jointBuf {
+    mat4 data[];
+} jointMatrices;
 
-layout(set = 3, binding = 0) uniform JointMatricesUniform {
-    mat4 jointMatrices[MAX_JOINTS];
-} jointMatricesUniform;
+layout (local_size_x=32, local_size_y=1, local_size_z=1) in;
 
 void main()
 {
@@ -29,10 +27,10 @@ void main()
     int baseIdxSrcBuf = int(gl_GlobalInvocationID.x) * 14;
     vec4 position = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 1);
     position =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * position +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * position +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * position +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * position;
+    weights.x * jointMatrices.data[joints.x] * position +
+    weights.y * jointMatrices.data[joints.y] * position +
+    weights.z * jointMatrices.data[joints.z] * position +
+    weights.w * jointMatrices.data[joints.w] * position;
     dstVector.data[baseIdxSrcBuf] = position.x / position.w;
     dstVector.data[baseIdxSrcBuf + 1] = position.y / position.w;
     dstVector.data[baseIdxSrcBuf + 2] = position.z / position.w;
@@ -40,10 +38,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 normal = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     normal =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * normal +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * normal +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * normal +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * normal;
+    weights.x * jointMatrices.data[joints.x] * normal +
+    weights.y * jointMatrices.data[joints.y] * normal +
+    weights.z * jointMatrices.data[joints.z] * normal +
+    weights.w * jointMatrices.data[joints.w] * normal;
     dstVector.data[baseIdxSrcBuf] = normal.x / normal.w;
     dstVector.data[baseIdxSrcBuf + 1] = normal.y / normal.w;
     dstVector.data[baseIdxSrcBuf + 2] = normal.z / normal.w;
@@ -51,10 +49,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 tangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     tangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * tangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * tangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * tangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * tangent;
+    weights.x * jointMatrices.data[joints.x] * tangent +
+    weights.y * jointMatrices.data[joints.y] * tangent +
+    weights.z * jointMatrices.data[joints.z] * tangent +
+    weights.w * jointMatrices.data[joints.w] * tangent;
     dstVector.data[baseIdxSrcBuf] = tangent.x / tangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = tangent.y / tangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = tangent.z / tangent.w;
@@ -62,10 +60,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 bitangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     bitangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * bitangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * bitangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * bitangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * bitangent;
+    weights.x * jointMatrices.data[joints.x] * bitangent +
+    weights.y * jointMatrices.data[joints.y] * bitangent +
+    weights.z * jointMatrices.data[joints.z] * bitangent +
+    weights.w * jointMatrices.data[joints.w] * bitangent;
     dstVector.data[baseIdxSrcBuf] = bitangent.x / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = bitangent.y / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = bitangent.z / bitangent.w;
diff --git a/booksamples/chapter-14/resources/shaders/animations_comp.glsl.spv b/booksamples/chapter-14/resources/shaders/animations_comp.glsl.spv
index 4385353932ff906baf9778df999e8da556bd9c41..ed5010528dae52526a5d5a6b22824f73443800f7 100644
GIT binary patch
literal 9408
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

literal 9476
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

diff --git a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/VulkanModel.java b/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/VulkanModel.java
index c9d1e5a2..6fe93c2a 100644
--- a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/VulkanModel.java
+++ b/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/VulkanModel.java
@@ -49,7 +49,7 @@ private static TransferBuffers createJointMatricesBuffers(Device device, ModelDa
         VulkanBuffer srcBuffer = new VulkanBuffer(device, bufferSize,
                 VK_BUFFER_USAGE_TRANSFER_SRC_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT, VK_MEMORY_PROPERTY_HOST_COHERENT_BIT);
         VulkanBuffer dstBuffer = new VulkanBuffer(device, bufferSize,
-                VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
+                VK_BUFFER_USAGE_TRANSFER_DST_BIT | VK_BUFFER_USAGE_STORAGE_BUFFER_BIT,
                 VK_MEMORY_PROPERTY_DEVICE_LOCAL_BIT, 0);
 
         long mappedMemory = srcBuffer.map();
diff --git a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java b/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
index 1e4cf019..5c5c3b1b 100644
--- a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
+++ b/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
@@ -28,7 +28,6 @@ public class AnimationComputeActivity {
     // Key is the model id
     private final Map<String, ModelDescriptorSets> modelDescriptorSetsMap;
     private final Scene scene;
-    private final AnimationSpecConstants animationSpecConstants;
 
     private CommandBuffer commandBuffer;
     private ComputePipeline computePipeline;
@@ -37,13 +36,11 @@ public class AnimationComputeActivity {
     private Fence fence;
     private ShaderProgram shaderProgram;
     private DescriptorSetLayout.StorageDescriptorSetLayout storageDescriptorSetLayout;
-    private DescriptorSetLayout.UniformDescriptorSetLayout uniformDescriptorSetLayout;
 
     public AnimationComputeActivity(CommandPool commandPool, PipelineCache pipelineCache, Scene scene) {
         this.scene = scene;
         device = pipelineCache.getDevice();
         computeQueue = new Queue.ComputeQueue(device, 0);
-        animationSpecConstants = new AnimationSpecConstants();
         createDescriptorPool();
         createDescriptorSets();
         createShaders();
@@ -56,12 +53,10 @@ public AnimationComputeActivity(CommandPool commandPool, PipelineCache pipelineC
 
     public void cleanup() {
         computePipeline.cleanup();
-        animationSpecConstants.cleanup();
         shaderProgram.cleanup();
         commandBuffer.cleanup();
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
-        uniformDescriptorSetLayout.cleanup();
         fence.cleanup();
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
@@ -79,19 +74,17 @@ private void createDescriptorPool() {
         int maxStorageBuffers = engineProperties.getMaxStorageBuffers();
         int maxJointsMatricesLists = engineProperties.getMaxJointsMatricesLists();
         List<DescriptorPool.DescriptorTypeCount> descriptorTypeCounts = new ArrayList<>();
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER));
+        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers + maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
         descriptorPool = new DescriptorPool(device, descriptorTypeCounts);
     }
 
     private void createDescriptorSets() {
         storageDescriptorSetLayout = new DescriptorSetLayout.StorageDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
-        uniformDescriptorSetLayout = new DescriptorSetLayout.UniformDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
         descriptorSetLayouts = new DescriptorSetLayout[]{
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
-                uniformDescriptorSetLayout,
+                storageDescriptorSetLayout,
         };
     }
 
@@ -108,8 +101,7 @@ private void createShaders() {
         }
         shaderProgram = new ShaderProgram(device, new ShaderProgram.ShaderModuleData[]
                 {
-                        new ShaderProgram.ShaderModuleData(VK_SHADER_STAGE_COMPUTE_BIT, ANIM_COMPUTE_SHADER_FILE_SPV,
-                                animationSpecConstants.getSpecInfo()),
+                        new ShaderProgram.ShaderModuleData(VK_SHADER_STAGE_COMPUTE_BIT, ANIM_COMPUTE_SHADER_FILE_SPV),
                 });
     }
 
@@ -199,7 +191,7 @@ public void registerModels(List<VulkanModel> vulkanModels) {
             for (VulkanModel.VulkanAnimation animation : vulkanModel.getAnimationList()) {
                 List<DescriptorSet> animationFrames = new ArrayList<>();
                 for (VulkanBuffer jointsMatricesBuffer : animation.frameBufferList()) {
-                    animationFrames.add(new DescriptorSet.UniformDescriptorSet(descriptorPool, uniformDescriptorSetLayout,
+                    animationFrames.add(new DescriptorSet.StorageDescriptorSet(descriptorPool, storageDescriptorSetLayout,
                             jointsMatricesBuffer, 0));
                 }
                 jointMatricesBufferDescriptorSets.add(animationFrames);
diff --git a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java b/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java
deleted file mode 100644
index a6e1d970..00000000
--- a/booksamples/chapter-14/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.vulkanb.eng.graph.animation;
-
-import org.lwjgl.system.MemoryUtil;
-import org.lwjgl.vulkan.*;
-import org.vulkanb.eng.EngineProperties;
-import org.vulkanb.eng.graph.vk.GraphConstants;
-
-import java.nio.ByteBuffer;
-
-public class AnimationSpecConstants {
-
-    private final ByteBuffer data;
-    private final VkSpecializationMapEntry.Buffer specEntryMap;
-    private final VkSpecializationInfo specInfo;
-
-    public AnimationSpecConstants() {
-        EngineProperties engineProperties = EngineProperties.getInstance();
-        data = MemoryUtil.memAlloc(GraphConstants.INT_LENGTH);
-        data.putInt(engineProperties.getMaxJointsMatricesLists());
-        data.flip();
-
-        specEntryMap = VkSpecializationMapEntry.calloc(1);
-        specEntryMap.get(0)
-                .constantID(0)
-                .size(GraphConstants.INT_LENGTH)
-                .offset(0);
-
-        specInfo = VkSpecializationInfo.calloc();
-        specInfo.pData(data)
-                .pMapEntries(specEntryMap);
-    }
-
-    public void cleanup() {
-        MemoryUtil.memFree(specEntryMap);
-        specInfo.free();
-        MemoryUtil.memFree(data);
-    }
-
-    public VkSpecializationInfo getSpecInfo() {
-        return specInfo;
-    }
-}
diff --git a/booksamples/chapter-15/resources/shaders/animations_comp.glsl b/booksamples/chapter-15/resources/shaders/animations_comp.glsl
index 20a9550b..1385cd15 100644
--- a/booksamples/chapter-15/resources/shaders/animations_comp.glsl
+++ b/booksamples/chapter-15/resources/shaders/animations_comp.glsl
@@ -1,7 +1,5 @@
 #version 450
 
-layout (constant_id = 0) const int MAX_JOINTS = 150;
-
 layout (std430, set=0, binding=0) readonly buffer srcBuf {
     float data[];
 } srcVector;
@@ -14,11 +12,11 @@ layout (std430, set=2, binding=0) buffer dstBuf {
     float data[];
 } dstVector;
 
-layout (local_size_x=32, local_size_y=1, local_size_z=1) in;
+layout (std430, set=3, binding=0) readonly buffer jointBuf {
+    mat4 data[];
+} jointMatrices;
 
-layout(set = 3, binding = 0) uniform JointMatricesUniform {
-    mat4 jointMatrices[MAX_JOINTS];
-} jointMatricesUniform;
+layout (local_size_x=32, local_size_y=1, local_size_z=1) in;
 
 void main()
 {
@@ -29,10 +27,10 @@ void main()
     int baseIdxSrcBuf = int(gl_GlobalInvocationID.x) * 14;
     vec4 position = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 1);
     position =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * position +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * position +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * position +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * position;
+    weights.x * jointMatrices.data[joints.x] * position +
+    weights.y * jointMatrices.data[joints.y] * position +
+    weights.z * jointMatrices.data[joints.z] * position +
+    weights.w * jointMatrices.data[joints.w] * position;
     dstVector.data[baseIdxSrcBuf] = position.x / position.w;
     dstVector.data[baseIdxSrcBuf + 1] = position.y / position.w;
     dstVector.data[baseIdxSrcBuf + 2] = position.z / position.w;
@@ -40,10 +38,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 normal = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     normal =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * normal +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * normal +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * normal +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * normal;
+    weights.x * jointMatrices.data[joints.x] * normal +
+    weights.y * jointMatrices.data[joints.y] * normal +
+    weights.z * jointMatrices.data[joints.z] * normal +
+    weights.w * jointMatrices.data[joints.w] * normal;
     dstVector.data[baseIdxSrcBuf] = normal.x / normal.w;
     dstVector.data[baseIdxSrcBuf + 1] = normal.y / normal.w;
     dstVector.data[baseIdxSrcBuf + 2] = normal.z / normal.w;
@@ -51,10 +49,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 tangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     tangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * tangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * tangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * tangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * tangent;
+    weights.x * jointMatrices.data[joints.x] * tangent +
+    weights.y * jointMatrices.data[joints.y] * tangent +
+    weights.z * jointMatrices.data[joints.z] * tangent +
+    weights.w * jointMatrices.data[joints.w] * tangent;
     dstVector.data[baseIdxSrcBuf] = tangent.x / tangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = tangent.y / tangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = tangent.z / tangent.w;
@@ -62,10 +60,10 @@ void main()
     baseIdxSrcBuf += 3;
     vec4 bitangent = vec4(srcVector.data[baseIdxSrcBuf], srcVector.data[baseIdxSrcBuf + 1], srcVector.data[baseIdxSrcBuf + 2], 0);
     bitangent =
-    weights.x * jointMatricesUniform.jointMatrices[joints.x] * bitangent +
-    weights.y * jointMatricesUniform.jointMatrices[joints.y] * bitangent +
-    weights.z * jointMatricesUniform.jointMatrices[joints.z] * bitangent +
-    weights.w * jointMatricesUniform.jointMatrices[joints.w] * bitangent;
+    weights.x * jointMatrices.data[joints.x] * bitangent +
+    weights.y * jointMatrices.data[joints.y] * bitangent +
+    weights.z * jointMatrices.data[joints.z] * bitangent +
+    weights.w * jointMatrices.data[joints.w] * bitangent;
     dstVector.data[baseIdxSrcBuf] = bitangent.x / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 1] = bitangent.y / bitangent.w;
     dstVector.data[baseIdxSrcBuf + 2] = bitangent.z / bitangent.w;
diff --git a/booksamples/chapter-15/resources/shaders/animations_comp.glsl.spv b/booksamples/chapter-15/resources/shaders/animations_comp.glsl.spv
index 4385353932ff906baf9778df999e8da556bd9c41..1de886ef709fc3b543aee11f589cd6f13620572e 100644
GIT binary patch
literal 9416
zcmZvh2XvKH7KQ&nBDUB83nE3uf>;n6Hf#X}MNwnNkVJ^a1WB+v2D@VKz4z`oz3Di;
z_uib|dvl62^L_8VEq7(ja~<wJ`<#2uzW*(@ks~ILs;Z`Ht*W(psi~^{)~`muRB)@+
z#<sZ&=1v<J?3%XgjGatary5zyGiP0LS{R$LGdp_v46Kc<2QRliHUTqN8_8cI7+=F_
zuGXyD<}PeI;)u4n2QTbgx^&^d;Ca2>3wwL|x)*l!EbHzZ>^ZyJyw!`mp1#iB<y~b$
z3mIkqmTD9;s%lZkK=+)kbKARn7B3kbIAHl{a4kgCx43s<TW|lOj@~(aXZLq@4EFT*
z%{izRZ?48No>QMheoM8<D!*3570dbS>KN>BY+=2dF*fEMi}wCyHNLr;&Uku%Pv77`
zJ#QX<L)(I7ozc}&Er4IzKhUEXAT^t-V;Bb-N%qzEx2kVT)s9b2(X*vG9j?~1ULJL$
zYMgUx{Jf6AWj&qUNUCY?{l9#3bq9Rcz~Ec!*7sNTze|5$u;|}hy$sjazwFEo3cHRb
z_It3SZ*h0uAbv}AIR2uZFy^#W_nFgu?%;v_{mZ%#*2X;dYAtLWroS=cYMA>yn?JJ;
z^0TQCe=@$mHqM)zC)WAy(IkvkZ}}6!{)`{ZSk}+?PW||0eYw<kFRbs+dirJk9(?QX
zkE!2%^5-2Y{q##b{aj->E-v@XJ|k;fG`N>)DE(5y?Zj5Cv8A@hP*r+Z&wb8(_t$zO
zFxRAC)_bw3zDIuN4aqWZBD0+@9?cy4O~6QHZ00mpHIp~KMvdnWeq-_1WR$ap`JMsi
z%Fk^0o(;L}8}nPi{>)#8(U>)i+h+sJcVP@wH)5QC*=sbTzGuq0V;I#Zzd5<?h4JxV
z*Qjsari`vnPEGorFS+#e-1;+rJfksdB|Zt<RQOZC<@~Amegk#x%$R+%-Y)p+lux}G
zVAm0UCfKtTe-_vp@!P=Gh<_y5Z|Ay?X3V-h<NEeJmQjszu3O)89^KCA#Hwm&Kl6FQ
zYdz#Q#$Uqdw^gToyc2SMU(dF_^Uh$jrks8BJ==1|`y1G~>UXb~V@-uW1dcA_D>1*P
zeZ2=+pXXiQx_2@<N6x<bp83>q&MTNd_vIcM%0<_`_<mFQ=z0M>0d6W^-!tr;kyEd>
z8@uFuzllFJz5(Ojslj@lT}S;fjAIMmvoO8z&GYXwW&VO;zHf9H_l+)n-{|<R$@f`*
z7OFfW>tfzP@7+FV^85N8$zO=?IrH!Ta+fhjf5QgnUEG&dx+Xd28{Zt0n}z3n*#h%U
zd5?^l=eM4K8OywhVCM}r`b-APO~O)ZOK@r#Ppz%M#!_o*a9L{`e7PxDYHbTnE#s-R
z9oSfEZ4WMM?SL=my-uxZ;M6jnT04S`&F8CoU;Kx!37C5AW881(IWU%<yMoJ}yWz{t
zz|wPfaC#a~&pp7#`WpMOCs;1E_X3x-_r{l-iKX^F;M6vr+WXe<s@nVE*SY%M?~h;B
zJ^){CR?X_?;XrU|8&B<nz{aBcV6a?t9|A6G&&HQ)!=if*IJJ$Z_Mu>7seKq&&VBLi
zos0RMT#tQ?yD!rjjpe=^4jz7Aj)0TTeVGrI%Y8WtEa$syP4Bc^)^!|ME^9a*+>Uu)
zjAaccfQ@C|iD2jDzMKS>EAPw6_^D+)wN3#WORa_Avev2ia^-#Lz)vmXskI1fEN8q6
ztX6v%>%?650!Cwg%WlTgu(4PxmRgG&yg8%5XJYO_a#jQPHF&>QKX@tDi}}5bS!)U7
zS(vdKsHMNG!P&zc@8bZbuA9iwAH>X)kIu8f>RgUR=Q&{c=sXv!&g7``JWM`1&j&}R
zvFN-2Y%Dr21k2eYIxhm3I^TwGp8Sf2_KU&lHx}(Hz-k}DqWu!Ee6(K*R{IcUj@mE7
z<fHv^aI_nX_A9`~qWwy+oIRrbDsZX&YJBtLqx~AN`i({VwP3Zc#G?H=uza*%4_13}
z)P4gdAMH1Squp4v-vl-m?Kgwv>=Es^fJ^PS;+rQQ?YDu|Z!G6r&Kl~u8=Hq^UH5>k
znKQi+_+CstIro9h$-2zBACtd|{nmc~bDq3w9nbh6b{94dv#)v{WHdK=9s;W;@5aMm
zxk*_1KLWOY&a?d<#pILo7<jnG$Km9o@d>c=<fHLPa5UOmjdJEj<5S>L<J0(ZQ?T@Z
z25kQ!%z0{j7L!lTbKv0`pNEr=#uvcOlaIz1!O>`MHOiSAjW2;qjc>=7n~IrlOfLEF
z0L!JvJHhRkdu1$Zco*1M=DizS_IVG!Tz$Xl`~F`1)H0r0?*ki4t@ne=S|7ldtAE#e
ztq<a-mhsg35ZGAW`B%YewTH1+FxUMu<EvQq;KSgtSSyxVuYu*w8O8V!Y&w=4@6AUW
zyx*%I{4p%|*qF7JFn+ud%RT-?gR_S@qZvPmsVndNr@-dPN9U)(>MYOvXYl2t^Rr-e
zCP$s0!{np$^Wf+-7M))J8;i~_g5~THonHc%I=_r>p8Sf&JO351`i({VSHWr@!mQ<8
z_!=f3?OzA0eF!s0?cc!Uqy3xUXg3z^-vS$p_HTpb>=EtX0hijpi*KHMw0{q*eq+)8
zeX!bBV$uEsuza+?4pw_|)c!;4bu8L{1deuN(f(twv1tDZSk4~N{!?(N{b%^*$w&Lo
z!Rj}bb1r8M_51>xhh<&A1Y0v_+CBLdCZC*NgU!jh%=rx_pZDpvVCTuZ*71zL!|uYy
zVfIyzoVn5Sd$4-)&i?@{HwjDsKZ5O_^KAb=Ve-lOGkCbhzre{y<6ptflaI!~fuqsh
zYLqiK8vhP1HNJr_Hw8=oe}L^jggH-*|HR~z^DppljsJ#|kH$B_&XbSE|A3>>-fEOH
zHyZy7E;Uw7RV6nSGvAn8@<)K>(qklkJHC5mENf^68_T>FaM@=ye7X95)%SfAerg#{
zt<}NCQfm!xS!+#vx%zjl*IEldwT!3M+F)aO=Uc&QwTH1+ScmKOzcm=k9;^c%ORN=3
zt##q#%^3y19(a0@<GooQPTud;kG}yp_t==VmcVZaHkNz55m?S1=8Pt1G+14E=f{A}
zlaJ1^V0D&feq*^tjyg91t1~(3+!RheIyVDHr?Kc92R0U+n}g--5uM|~rOqwz&68iz
zc;_d8)o(1?CxX>JgjvhGFbPgR-*_@u?a5L5mT>aXz7;syjYa#`U}Mof1uSQeXx|20
zYTp*$Jo#wf4y=A-(Y`%c?d4lH6;3|dcL1wBIclE<Cm-!Qf}`D7wC@Bq7VSHO<?Ipd
zyMRmW)A7xdkM>=`>Nl2iE@ut(%mCN#cm3aEcf+@4dG2?|m(SYwXyjyF?%SSl@_C>3
z0y|IMwffG_1m}ISuX^Onjh?;1<z3$gU#@)T_r+IZ&a?gZ!<Uc7{Tn%@##wOk(RcvZ
zdGgVCAUGQBtwuR>qwyecsqtWZx$>Pq1YeCqXmg$#+wkS1adso8)HnxDJ{k`NJ5N3u
z4+BS|z11jZZZysXmm25c%S}ax`Nrgue?%icJ?7)LljA#YENeItY%KGR0+)Rj;LDZo
z{L%QSWjwWx0UJxLW5H#uc6_<=oj(pgwT!3M@nB<l=T88u)gH$3&L0jomOVHT>^*M9
zQtKo*d2@U}PX-Tv=TCu?_j~!yF9hcv8?%=0{Hb7LxyKz~IeVDnJHH65uDtV|VDsdo
zvkR=w^2~R`$w%jD;NkE5VmSHeTmp_xW6{|IHWr<ygXQcIoo9ecoxS+x$**X<^Jjw9
zZ!FsTz-k}DtmR$khm()?rQqT3{8@1F(Y_2E?Z%>g0BkJU2f=doi1y{+Qv2EX=E+C<
zIbii0i}rKDYA^5Td2sU4em;2kJAVP3e6(K(j&@_wei7JMw7(53XOC#V7+h)}!Z%Mo
z+E;+pZ_N8`zMM6D=Pv<!x3aEF@y#jE{bl&_$+^6dQ?C6AIQhI!SAv}<?^=E5uL9?N
zvafpN%#EI_!R1}Q24Ajx=U3vZu{`tF;>$<lb&Z@-<MnXz(Rc&cdGgVCBRCrEtwuR>
zqwywisqtofx$>RA1z(LrtlN2>?OXBXqw%&zPO0&BIQeM21MEEcXuJ~~jrLZfoVn3>
z7r4}TH@@6dbeL~UF8TL2^3&r1{C0AD=Z$3z4}y(l-b3KB&%^j~<vafferg#{tw+Je
z=JQ6}!}u6xeR(zB*Wl9YaeRB_`#phgPAgn$K8Y`%bvy;mw{pI9<;+Xnr@`eKp23$Z
i&)l>4_A1ZZbNKS<^*lJetYI%X^WLnQ`2SN))&Br^jV3Js

literal 9476
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

diff --git a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
index 1e4cf019..5c5c3b1b 100644
--- a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
+++ b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationComputeActivity.java
@@ -28,7 +28,6 @@ public class AnimationComputeActivity {
     // Key is the model id
     private final Map<String, ModelDescriptorSets> modelDescriptorSetsMap;
     private final Scene scene;
-    private final AnimationSpecConstants animationSpecConstants;
 
     private CommandBuffer commandBuffer;
     private ComputePipeline computePipeline;
@@ -37,13 +36,11 @@ public class AnimationComputeActivity {
     private Fence fence;
     private ShaderProgram shaderProgram;
     private DescriptorSetLayout.StorageDescriptorSetLayout storageDescriptorSetLayout;
-    private DescriptorSetLayout.UniformDescriptorSetLayout uniformDescriptorSetLayout;
 
     public AnimationComputeActivity(CommandPool commandPool, PipelineCache pipelineCache, Scene scene) {
         this.scene = scene;
         device = pipelineCache.getDevice();
         computeQueue = new Queue.ComputeQueue(device, 0);
-        animationSpecConstants = new AnimationSpecConstants();
         createDescriptorPool();
         createDescriptorSets();
         createShaders();
@@ -56,12 +53,10 @@ public AnimationComputeActivity(CommandPool commandPool, PipelineCache pipelineC
 
     public void cleanup() {
         computePipeline.cleanup();
-        animationSpecConstants.cleanup();
         shaderProgram.cleanup();
         commandBuffer.cleanup();
         descriptorPool.cleanup();
         storageDescriptorSetLayout.cleanup();
-        uniformDescriptorSetLayout.cleanup();
         fence.cleanup();
         for (Map.Entry<String, List<EntityAnimationBuffer>> entry : entityAnimationsBuffers.entrySet()) {
             entry.getValue().forEach(EntityAnimationBuffer::cleanup);
@@ -79,19 +74,17 @@ private void createDescriptorPool() {
         int maxStorageBuffers = engineProperties.getMaxStorageBuffers();
         int maxJointsMatricesLists = engineProperties.getMaxJointsMatricesLists();
         List<DescriptorPool.DescriptorTypeCount> descriptorTypeCounts = new ArrayList<>();
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
-        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER));
+        descriptorTypeCounts.add(new DescriptorPool.DescriptorTypeCount(maxStorageBuffers + maxJointsMatricesLists, VK_DESCRIPTOR_TYPE_STORAGE_BUFFER));
         descriptorPool = new DescriptorPool(device, descriptorTypeCounts);
     }
 
     private void createDescriptorSets() {
         storageDescriptorSetLayout = new DescriptorSetLayout.StorageDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
-        uniformDescriptorSetLayout = new DescriptorSetLayout.UniformDescriptorSetLayout(device, 0, VK_SHADER_STAGE_COMPUTE_BIT);
         descriptorSetLayouts = new DescriptorSetLayout[]{
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
                 storageDescriptorSetLayout,
-                uniformDescriptorSetLayout,
+                storageDescriptorSetLayout,
         };
     }
 
@@ -108,8 +101,7 @@ private void createShaders() {
         }
         shaderProgram = new ShaderProgram(device, new ShaderProgram.ShaderModuleData[]
                 {
-                        new ShaderProgram.ShaderModuleData(VK_SHADER_STAGE_COMPUTE_BIT, ANIM_COMPUTE_SHADER_FILE_SPV,
-                                animationSpecConstants.getSpecInfo()),
+                        new ShaderProgram.ShaderModuleData(VK_SHADER_STAGE_COMPUTE_BIT, ANIM_COMPUTE_SHADER_FILE_SPV),
                 });
     }
 
@@ -199,7 +191,7 @@ public void registerModels(List<VulkanModel> vulkanModels) {
             for (VulkanModel.VulkanAnimation animation : vulkanModel.getAnimationList()) {
                 List<DescriptorSet> animationFrames = new ArrayList<>();
                 for (VulkanBuffer jointsMatricesBuffer : animation.frameBufferList()) {
-                    animationFrames.add(new DescriptorSet.UniformDescriptorSet(descriptorPool, uniformDescriptorSetLayout,
+                    animationFrames.add(new DescriptorSet.StorageDescriptorSet(descriptorPool, storageDescriptorSetLayout,
                             jointsMatricesBuffer, 0));
                 }
                 jointMatricesBufferDescriptorSets.add(animationFrames);
diff --git a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java b/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java
deleted file mode 100644
index a6e1d970..00000000
--- a/booksamples/chapter-15/src/main/java/org/vulkanb/eng/graph/animation/AnimationSpecConstants.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package org.vulkanb.eng.graph.animation;
-
-import org.lwjgl.system.MemoryUtil;
-import org.lwjgl.vulkan.*;
-import org.vulkanb.eng.EngineProperties;
-import org.vulkanb.eng.graph.vk.GraphConstants;
-
-import java.nio.ByteBuffer;
-
-public class AnimationSpecConstants {
-
-    private final ByteBuffer data;
-    private final VkSpecializationMapEntry.Buffer specEntryMap;
-    private final VkSpecializationInfo specInfo;
-
-    public AnimationSpecConstants() {
-        EngineProperties engineProperties = EngineProperties.getInstance();
-        data = MemoryUtil.memAlloc(GraphConstants.INT_LENGTH);
-        data.putInt(engineProperties.getMaxJointsMatricesLists());
-        data.flip();
-
-        specEntryMap = VkSpecializationMapEntry.calloc(1);
-        specEntryMap.get(0)
-                .constantID(0)
-                .size(GraphConstants.INT_LENGTH)
-                .offset(0);
-
-        specInfo = VkSpecializationInfo.calloc();
-        specInfo.pData(data)
-                .pMapEntries(specEntryMap);
-    }
-
-    public void cleanup() {
-        MemoryUtil.memFree(specEntryMap);
-        specInfo.free();
-        MemoryUtil.memFree(data);
-    }
-
-    public VkSpecializationInfo getSpecInfo() {
-        return specInfo;
-    }
-}