From 710feee96f02b2ed4755b5773375ff1b01873181 Mon Sep 17 00:00:00 2001 From: Josh Simmons Date: Mon, 4 Nov 2024 21:21:42 +0100 Subject: [PATCH] shark-shaders: Move count ref into radix_sort.h --- title/shark-shaders/shaders/radix_sort.h | 4 ++++ title/shark-shaders/shaders/radix_sort_0_upsweep.comp | 4 ---- title/shark-shaders/shaders/radix_sort_1_spine.comp | 4 ---- title/shark-shaders/shaders/radix_sort_2_downsweep.comp | 4 ---- 4 files changed, 4 insertions(+), 12 deletions(-) diff --git a/title/shark-shaders/shaders/radix_sort.h b/title/shark-shaders/shaders/radix_sort.h index 52ce630..cee1983 100644 --- a/title/shark-shaders/shaders/radix_sort.h +++ b/title/shark-shaders/shaders/radix_sort.h @@ -11,4 +11,8 @@ const uint RADIX_ITEMS_PER_WGP = RADIX_WGP_SIZE * RADIX_ITEMS_PER_INVOCATION; const uint RADIX_SPINE_WGP_SIZE = 256; +layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer CountRef { + uint value; +}; + #endif diff --git a/title/shark-shaders/shaders/radix_sort_0_upsweep.comp b/title/shark-shaders/shaders/radix_sort_0_upsweep.comp index 69f4904..480fbf7 100644 --- a/title/shark-shaders/shaders/radix_sort_0_upsweep.comp +++ b/title/shark-shaders/shaders/radix_sort_0_upsweep.comp @@ -14,10 +14,6 @@ #include "draw_2d.h" #include "indirect.h" -layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer CountRef { - uint value; -}; - layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer ValuesRef { uint values[]; }; diff --git a/title/shark-shaders/shaders/radix_sort_1_spine.comp b/title/shark-shaders/shaders/radix_sort_1_spine.comp index 0b1dfc4..a47dc4f 100644 --- a/title/shark-shaders/shaders/radix_sort_1_spine.comp +++ b/title/shark-shaders/shaders/radix_sort_1_spine.comp @@ -21,10 +21,6 @@ #include "draw_2d.h" #include "indirect.h" -layout(buffer_reference, std430, buffer_reference_align = 4) buffer CountRef { - uint value; -}; - layout(buffer_reference, std430, buffer_reference_align = 4) buffer SpineRef { uint values[]; }; diff --git a/title/shark-shaders/shaders/radix_sort_2_downsweep.comp b/title/shark-shaders/shaders/radix_sort_2_downsweep.comp index 4a1f1c8..19fcbcf 100644 --- a/title/shark-shaders/shaders/radix_sort_2_downsweep.comp +++ b/title/shark-shaders/shaders/radix_sort_2_downsweep.comp @@ -27,10 +27,6 @@ layout (constant_id = 0) const uint SUBGROUP_SIZE = 64; const uint NUM_SUBGROUPS = RADIX_WGP_SIZE / SUBGROUP_SIZE; -layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer CountRef { - uint value; -}; - layout(buffer_reference, std430, buffer_reference_align = 4) readonly buffer SpineRef { uint values[]; }; -- 2.49.0