Progress in lighting

Author: lwjglgamedev

booksamples/chapter-10/resources/shaders/geometry_fragment.glsl

@@ -37,17 +37,21 @@ void main()
 {
     outAlbedo = material.diffuseColor + texture(textSampler, inTextCoords);
 
+    // Hack to avoid transparent PBR artifacts
+    if (outAlbedo.a < 0.5) {
+        discard;
+    }
+
     mat3 TBN = mat3(inTangent, inBitangent, inNormal);
     vec3 newNormal = calcNormal(material.hasNormalMap, inNormal, inTextCoords, TBN);
     // Transform normals from [-1, 1] to [0, 1]
     outNormal = vec4(0.5 * newNormal + 0.5, 1.0);
 
-    float ao = 1.0f;
+    float ao = 0.5f;
     float roughnessFactor = 0.0f;
     float metallicFactor = 0.0f;
     if (material.hasMetalRoughMap > 0) {
         vec4 metRoughValue = texture(metRoughSampler, inTextCoords);
-        ao = metRoughValue.r;
         roughnessFactor = metRoughValue.g;
         metallicFactor = metRoughValue.b;
     } else {

booksamples/chapter-10/resources/shaders/geometry_fragment.glsl.spv

@@ -1,4 +1,5 @@
 #version 450
+precision highp float;
 
 const int MAX_LIGHTS = 10;
 const float PI = 3.14159265359;

booksamples/chapter-10/resources/shaders/lighting_fragment.glsl

@@ -108,7 +108,7 @@ public void init(Window window, Scene scene, Render render) {
         Light light = new Light();
         light.getPosition().set(0, 40, 0, 1.0f);
         light.getColor().set(0.0f, 1.0f, 0.0f, 1.0f);
-        //lights.add(light);
+        lights.add(light);
 
         Light[] lightArr = new Light[lights.size()];
         lightArr = lights.toArray(lightArr);

booksamples/chapter-10/src/main/java/org/vulkanb/Main.java

@@ -205,7 +205,7 @@ public void recordCommandBuffers(List<VulkanMesh> meshes, Scene scene) {
                 if (attachments[i].isDepthAttachment()) {
                     clearValues.apply(i, v -> v.depthStencil().depth(1.0f));
                 } else {
-                    clearValues.apply(i, v -> v.color().float32(0, 0.5f).float32(1, 0.7f).float32(2, 0.9f).float32(3, 1));
+                    clearValues.apply(i, v -> v.color().float32(0, 0.0f).float32(1, 0.0f).float32(2, 0.0f).float32(3, 1));
                 }
             }
 

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderActivity.java

@@ -9,7 +9,6 @@
 import static org.lwjgl.vulkan.VK11.*;
 import static org.vulkanb.eng.graph.vk.VulkanUtils.vkCheck;
 
-// TODO: Samples
 public class GeometryRenderPass {
 
     private static final int MAX_SAMPLES = 1;

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/geometry/GeometryRenderPass.java

@@ -18,9 +18,6 @@
 import static org.lwjgl.vulkan.VK11.*;
 import static org.vulkanb.eng.graph.vk.VulkanUtils.vkCheck;
 
-// TODO: Pre-record commands
-// TODO: Update lights method
-// TODO: Update lights Uniform per swap chain image?
 public class LightingRenderActivity {
 
     private static final String LIGHTING_FRAGMENT_SHADER_FILE_GLSL = "resources/shaders/lighting_fragment.glsl";
@@ -40,9 +37,9 @@ public class LightingRenderActivity {
     private VulkanBuffer invProjBuffer;
     private MatrixDescriptorSet invProjMatrixDescriptorSet;
     private LightingFrameBuffer lightingFrameBuffer;
-    private VulkanBuffer lightsBuffer;
-    private LightsDescriptorSet lightsDescriptorSet;
+    private VulkanBuffer[] lightsBuffers;
     private LightsDescriptorSetLayout lightsDescriptorSetLayout;
+    private LightsDescriptorSet[] lightsDescriptorSets;
     private MatrixDescriptorSetLayout matrixDescriptorSetLayout;
     private Pipeline pipeline;
     private PipelineCache pipelineCache;
@@ -60,12 +57,15 @@ public LightingRenderActivity(SwapChain swapChain, CommandPool commandPool, Pipe
         int numImages = swapChain.getNumImages();
         createShaders();
         createDescriptorPool();
-        createUniforms();
-        createDescriptorSets(geometryFrameBuffer);
+        createUniforms(numImages);
+        createDescriptorSets(geometryFrameBuffer, numImages);
         createPipeline();
         createCommandBuffers(commandPool, numImages);
+        updateInvProjMatrix(scene);
 
-        VulkanUtils.copyMatrixToBuffer(device, invProjBuffer, scene.getPerspective().getPerspectiveMatrix());
+        for (int i = 0; i < numImages; i++) {
+            preRecordCommandBuffer(i);
+        }
     }
 
     public void cleanup() {
@@ -75,7 +75,7 @@ public void cleanup() {
         attachmentsLayout.cleanup();
         descriptorPool.cleanup();
         ambientLightBuffer.cleanup();
-        lightsBuffer.cleanup();
+        Arrays.stream(lightsBuffers).forEach(VulkanBuffer::cleanup);
         pipeline.cleanup();
         invProjBuffer.cleanup();
         lightingFrameBuffer.cleanup();
@@ -101,7 +101,7 @@ private void createDescriptorPool() {
         descriptorPool = new DescriptorPool(device, descriptorTypeCounts);
     }
 
-    private void createDescriptorSets(GeometryFrameBuffer geometryFrameBuffer) {
+    private void createDescriptorSets(GeometryFrameBuffer geometryFrameBuffer, int numImages) {
         attachmentsLayout = new AttachmentsLayout(device, GeometryAttachments.NUMBER_ATTACHMENTS);
         lightsDescriptorSetLayout = new LightsDescriptorSetLayout(device);
         matrixDescriptorSetLayout = new MatrixDescriptorSetLayout(device, 0, VK_SHADER_STAGE_FRAGMENT_BIT);
@@ -113,10 +113,14 @@ private void createDescriptorSets(GeometryFrameBuffer geometryFrameBuffer) {
 
         attachmentsDescriptorSet = new AttachmentsDescriptorSet(descriptorPool, attachmentsLayout,
                 geometryFrameBuffer, 0);
-        lightsDescriptorSet = new LightsDescriptorSet(descriptorPool, lightsDescriptorSetLayout,
-                lightsBuffer, ambientLightBuffer, 0);
         invProjMatrixDescriptorSet = new MatrixDescriptorSet(descriptorPool, matrixDescriptorSetLayout,
                 invProjBuffer, 0);
+
+        lightsDescriptorSets = new LightsDescriptorSet[numImages];
+        for (int i = 0; i < numImages; i++) {
+            lightsDescriptorSets[i] = new LightsDescriptorSet(descriptorPool, lightsDescriptorSetLayout,
+                    lightsBuffers[i], ambientLightBuffer, 0);
+        }
     }
 
     private void createPipeline() {
@@ -140,33 +144,29 @@ private void createShaders() {
                 });
     }
 
-    private void createUniforms() {
+    private void createUniforms(int numImages) {
         ambientLightBuffer = new VulkanBuffer(device, GraphConstants.VEC4_SIZE, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
-        lightsBuffer = new VulkanBuffer(device,
-                GraphConstants.INT_LENGTH * 4 + GraphConstants.VEC4_SIZE * 2 * GraphConstants.MAX_LIGHTS,
-                VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
         invProjBuffer = new VulkanBuffer(device, GraphConstants.MAT4X4_SIZE, VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT,
                 VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
-    }
 
-    public void recordCommandBuffer(Scene scene) {
-        updateLights(scene.getAmbientLight(), scene.getLights(), scene.getCamera().getViewMatrix());
+        lightsBuffers = new VulkanBuffer[numImages];
+        for (int i = 0; i < numImages; i++) {
+            lightsBuffers[i] = new VulkanBuffer(device,
+                    GraphConstants.INT_LENGTH * 4 + GraphConstants.VEC4_SIZE * 2 * GraphConstants.MAX_LIGHTS,
+                    VK_BUFFER_USAGE_UNIFORM_BUFFER_BIT, VK_MEMORY_PROPERTY_HOST_VISIBLE_BIT);
+        }
+    }
 
+    public void preRecordCommandBuffer(int idx) {
         try (MemoryStack stack = MemoryStack.stackPush()) {
             VkExtent2D swapChainExtent = swapChain.getSwapChainExtent();
             int width = swapChainExtent.width();
             int height = swapChainExtent.height();
-            int idx = swapChain.getCurrentFrame();
 
             FrameBuffer frameBuffer = lightingFrameBuffer.getFrameBuffers()[idx];
-
-            Fence fence = fences[idx];
             CommandBuffer commandBuffer = commandBuffers[idx];
 
-            fence.fenceWait();
-            fence.reset();
-
             commandBuffer.reset();
             VkClearValue.Buffer clearValues = VkClearValue.callocStack(1, stack);
             clearValues.apply(0, v -> v.color().float32(0, 0.5f).float32(1, 0.7f).float32(2, 0.9f).float32(3, 1));
@@ -209,7 +209,7 @@ public void recordCommandBuffer(Scene scene) {
 
             LongBuffer descriptorSets = stack.mallocLong(3)
                     .put(0, attachmentsDescriptorSet.getVkDescriptorSet())
-                    .put(1, lightsDescriptorSet.getVkDescriptorSet())
+                    .put(1, lightsDescriptorSets[idx].getVkDescriptorSet())
                     .put(2, invProjMatrixDescriptorSet.getVkDescriptorSet());
             vkCmdBindDescriptorSets(cmdHandle, VK_PIPELINE_BIND_POINT_GRAPHICS,
                     pipeline.getVkPipelineLayout(), 0, descriptorSets, null);
@@ -221,15 +221,30 @@ public void recordCommandBuffer(Scene scene) {
         }
     }
 
+    public void recordCommandBuffer(Scene scene) {
+        int idx = swapChain.getCurrentFrame();
+        Fence fence = fences[idx];
+
+        fence.fenceWait();
+        fence.reset();
+
+        updateLights(scene.getAmbientLight(), scene.getLights(), scene.getCamera().getViewMatrix(),
+                lightsBuffers[idx]);
+    }
+
     public void resize(SwapChain swapChain, GeometryFrameBuffer geometryFrameBuffer, Scene scene) {
         lightingFrameBuffer.cleanup();
         pipeline.cleanup();
         attachmentsDescriptorSet.update(geometryFrameBuffer);
 
         lightingFrameBuffer = new LightingFrameBuffer(swapChain);
         createPipeline();
+        updateInvProjMatrix(scene);
 
-        VulkanUtils.copyMatrixToBuffer(device, invProjBuffer, scene.getPerspective().getPerspectiveMatrix());
+        int numImages = swapChain.getNumImages();
+        for (int i = 0; i < numImages; i++) {
+            preRecordCommandBuffer(i);
+        }
     }
 
     public void submit(Queue queue) {
@@ -245,7 +260,13 @@ public void submit(Queue queue) {
         }
     }
 
-    private void updateLights(Vector4f ambientLight, Light[] lights, Matrix4f viewMatrix) {
+    private void updateInvProjMatrix(Scene scene) {
+        Matrix4f invProj = new Matrix4f(scene.getPerspective().getPerspectiveMatrix()).invert();
+        VulkanUtils.copyMatrixToBuffer(device, invProjBuffer, invProj);
+    }
+
+    private void updateLights(Vector4f ambientLight, Light[] lights, Matrix4f viewMatrix,
+                              VulkanBuffer lightsBuffer) {
         VulkanUtils.copyVectortoBuffer(device, ambientLightBuffer, ambientLight);
 
         try (MemoryStack stack = MemoryStack.stackPush()) {

booksamples/chapter-10/src/main/java/org/vulkanb/eng/graph/lighting/LightingRenderActivity.java

@@ -5,16 +5,10 @@
 
 public class Perspective {
 
-    private Matrix4f invPerspectiveMatrix;
     private Matrix4f perspectiveMatrix;
 
     public Perspective() {
         perspectiveMatrix = new Matrix4f();
-        invPerspectiveMatrix = new Matrix4f();
-    }
-
-    public Matrix4f getInvPerspectiveMatrix() {
-        return invPerspectiveMatrix;
     }
 
     public Matrix4f getPerspectiveMatrix() {
@@ -26,6 +20,5 @@ public void resize(int width, int height) {
         perspectiveMatrix.identity();
         perspectiveMatrix.perspective(engProps.getFov(), (float) width / (float) height,
                 engProps.getZNear(), engProps.getZFar(), true);
-        perspectiveMatrix.invert(invPerspectiveMatrix);
     }
 }