Changeset 055750a in opengl-game for shaders

Timestamp:

Dec 4, 2019, 9:33:43 PM (5 years ago)

Author:

Dmitry Portnoy <dmitry.portnoy@…>

Branches:

feature/imgui-sdl, master, points-test

Children:

785333b, cf727ca

Parents:

e1308e8

Message:

In VulkanGame, use SSBOs in the ship and scene shaders to store per-object data (currently just the model matrix)

Location:

shaders

Files:

• scene.frag (modified) (1 diff)
• scene.vert (modified) (2 diffs)
• ship.vert (modified) (2 diffs)

shaders/scene.frag

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
-layout(binding = 1) uniform sampler2D texSampler;
+layout(binding = 2) uniform sampler2D texSampler;
 
 layout(location = 0) in vec3 fragColor;

shaders/scene.vert

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
+struct Object {
+   mat4 model;
+};
+
 layout (binding = 0) uniform UniformBufferObject {
-   mat4 model;
    mat4 view;
    mat4 proj;
 } ubo;
+
+layout(binding = 1) readonly buffer StorageBufferObject {
+    Object objects[];
+} sbo;
 
 layout(location = 0) in vec3 inPosition;
@@ -19 +26 @@
    fragTexCoord = inTexCoord;
 
-   gl_Position = ubo.proj * ubo.view * ubo.model * vec4(inPosition, 1.0);
+   gl_Position = ubo.proj * ubo.view * sbo.objects[0].model * vec4(inPosition, 1.0);
 }

shaders/ship.vert

@@ -2 +2 @@
 #extension GL_ARB_separate_shader_objects : enable
 
+struct Object {
+   mat4 model;
+};
+
 layout (binding = 0) uniform UniformBufferObject {
-   mat4 model;
    mat4 view;
    mat4 proj;
 } ubo;
+
+layout(binding = 1) readonly buffer StorageBufferObject {
+    Object objects[];
+} sbo;
 
 layout(location = 0) in vec3 vertex_position;
@@ -26 +33 @@
 // Check Anton's book to see how to fix this
 void main() {
-   position_eye = vec3(ubo.view * ubo.model * vec4(vertex_position, 1.0));
+   position_eye = vec3(ubo.view * sbo.objects[0].model * vec4(vertex_position, 1.0));
    //position_eye = vec3(view * model_mats[ubo_index] * vec4(vertex_position, 1.0));
 
    // Using 0.0 instead of 1.0 means translations won't effect the normal
-   normal_eye = normalize(vec3(ubo.view * ubo.model * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(ubo.view * sbo.objects[0].model * vec4(vertex_normal, 0.0)));
    //normal_eye = normalize(vec3(view * model_mats[ubo_index] * vec4(vertex_normal, 0.0)));
    color = vertex_color;