Fix some descriptor heap usage errors

Change VKCHECK macro

2 files changed, 15 insertions, 50 deletions

diff --git a/shaders/api-test-ui.frag b/shaders/api-test-ui.frag
index ad2ea21..5c56479 100644
--- a/shaders/api-test-ui.frag
+++ b/shaders/api-test-ui.frag
@@ -27,11 +27,13 @@ layout(buffer_reference) readonly buffer vertices {
 

 layout(push_constant) uniform registers {

     vertices vertex_buffer;

-    vec2 scale;

-    vec2 translate;

-    uint texture_index;

-} regs;

+    // vec2 scale;

+    // vec2 translate;

+    // uint texture_index;

+    // uint padding;

+};

 

 void main() {

-    o_Color = In.color * texture(sampler2D(textures[nonuniformEXT(regs.texture_index)], samplers[nonuniformEXT(0U)]), In.uv.xy);

+    // o_Color = In.color * texture(sampler2D(textures[nonuniformEXT(texture_index)], samplers[nonuniformEXT(0U)]), In.uv.xy);

+    o_Color = vec4(1.f, 0.f, 0.f, 1.f);

 }

diff --git a/shaders/api-test-ui.vert b/shaders/api-test-ui.vert
index f4d5fee..29e8842 100644
--- a/shaders/api-test-ui.vert
+++ b/shaders/api-test-ui.vert
@@ -8,56 +8,18 @@ struct vertex {
     uint    color;

 };

 

-struct camera {

-    vec4 position;

-

-    vec4 forward;

-    vec4 up;

-    vec4 right;

-

-    vec4 horizontal;

-    vec4 vertical;

-    vec4 first_pixel;

-

-    float lens_radius;

-};

-

-layout(buffer_reference) readonly buffer global_params {

-    camera cam;

-

-    uint max_bounce;

-    uint min_bounce;

-    uint width;

-    uint height;

-    uint sample_index;

-

-    uint enable_dof;

-    uint debug_bvh;

-    int downscale_factor;

-};

-

-layout(buffer_reference) readonly buffer pass_params {

-    uint padding;

-};

-

 layout(buffer_reference) readonly buffer vertices {

     vertex vertices[];

 };

 

-layout(buffer_reference) readonly buffer params {

+layout(push_constant) uniform registers {

     vertices vertex_buffer;

-    vec2 scale;

-    vec2 translate;

-    uint texture_index;

-    uint padding;

+    // vec2 scale;

+    // vec2 translate;

+    // uint texture_index;

+    // uint padding;

 };

 

-layout(push_constant) uniform registers {

-    global_params globals;

-    pass_params pass;

-    params ui_params;

-} regs;

-

 out gl_PerVertex {

     vec4 gl_Position;

 };

@@ -69,11 +31,12 @@ layout(location = 0) out struct {
 

 

 void main() {

-    vertex v = regs.ui_params.vertex_buffer.vertices[gl_VertexIndex];

+    vertex v = vertex_buffer.vertices[gl_VertexIndex];

 

     Out.color = unpackUnorm4x8(v.color);

     Out.uv = vec2(v.uv_x, v.uv_y);

 

     vec2 pos = vec2(v.pos_x, v.pos_y);

-    gl_Position = vec4(pos * regs.ui_params.scale + regs.ui_params.translate, 0.0, 1.0);

+    gl_Position = vec4(pos * (vec2(1280.f, 720.f) / 2.f) + vec2(-1.f, -1.f), 0.0, 1.0);

+    // gl_Position = vec4(pos * scale + translate, -1.f), 0.0, 1.0);

 }