Changeset 67527a5 in opengl-game for shaders/model.vert

Timestamp:

Jun 21, 2021, 4:12:08 PM (4 years ago)

Author:

Dmitry Portnoy <dportnoy@…>

Branches:

feature/imgui-sdl

Children:

27e580e

Parents:

b01b50c

git-author:

Dmitry Portnoy <dportnoy@…> (06/21/21 15:13:03)

git-committer:

Dmitry Portnoy <dportnoy@…> (06/21/21 16:12:08)

Message:

Switch all per-object buffers to be dynamic uniform buffers instead of shader storage buffers

File:

• shaders/model.vert (modified) (2 diffs)

shaders/model.vert

@@ -6 +6 @@
 };
 
-layout (binding = 0) uniform UniformBufferObject {
+layout (binding = 0) uniform camera_block {
    mat4 view;
    mat4 proj;
+} camera;
+
+// TODO: Verify that I can actually store 1024 values here. They last time I checked, I think I could only store 1016 values
+layout (binding = 1) uniform ubo_block {
+        Object objects[1024];
 } ubo;
-
-layout(binding = 1) readonly buffer StorageBufferObject {
-   Object objects[];
-} sbo;
-
-layout (binding = 2) uniform UboInstance {
-        mat4 model;
-} uboInstance;
 
 layout(location = 0) in vec3 inPosition;
@@ -31 +28 @@
 void main() {
    // Using 0.0 instead of 1.0 means translations won't effect the normal
-   normal_eye = normalize(vec3(ubo.view * sbo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
+   normal_eye = normalize(vec3(camera.view * ubo.objects[obj_index].model * vec4(vertex_normal, 0.0)));
 
    fragColor = inColor;
    fragTexCoord = inTexCoord;
 
-   gl_Position = ubo.proj * ubo.view * sbo.objects[obj_index].model * vec4(inPosition, 1.0);
+   gl_Position = camera.proj * camera.view * ubo.objects[obj_index].model * vec4(inPosition, 1.0);
 }