diff options
author | asuonpaa <34128694+asuonpaa@users.noreply.github.com> | 2020-06-24 20:12:03 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-24 18:12:03 +0100 |
commit | eeb83ebf2c602e2f9ddd6b9ea39bf6204a06984a (patch) | |
tree | a9d8218ce73611b6e4fed96b97cf5df18b5a0378 /tests | |
parent | 7902b74279225a71639d7f41b9a23130bf4efc02 (diff) | |
download | amber-eeb83ebf2c602e2f9ddd6b9ea39bf6204a06984a.tar.gz |
Add dynamic uniform and storage buffer support (#877)
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cases/compute_dynamic_buffers.amber | 54 | ||||
-rw-r--r-- | tests/cases/compute_dynamic_buffers_descriptor_array.amber | 48 | ||||
-rw-r--r-- | tests/cases/graphics_dynamic_buffers.amber | 135 |
3 files changed, 237 insertions, 0 deletions
diff --git a/tests/cases/compute_dynamic_buffers.amber b/tests/cases/compute_dynamic_buffers.amber new file mode 100644 index 0000000..9412e30 --- /dev/null +++ b/tests/cases/compute_dynamic_buffers.amber @@ -0,0 +1,54 @@ +#!amber +# Copyright 2020 The Amber Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SHADER compute compute_shader GLSL +#version 430 + +layout(set = 0, binding = 0) buffer block0 +{ + vec4 data0; +}; + +layout(set = 0, binding = 1) buffer block1 +{ + vec4 data1; +}; + +void main() +{ + data0 = vec4(1, 2, 3, 4); + data1 = vec4(5, 6, 7, 8); +} +END + +# The Vulkan spec lists the maximum value of minStorageBufferOffsetAlignment +# (i.e. the maximum possible alignment requirement) as 256 bytes. +# Allocate enough space to hold one vec4 (each 16 bytes) +# after the alignment (256 / 16 + 1). +BUFFER buf0 DATA_TYPE vec4<float> SIZE 17 FILL 0.0 +BUFFER buf1 DATA_TYPE vec4<float> SIZE 17 FILL 0.0 + +PIPELINE compute pipeline + ATTACH compute_shader + + BIND BUFFER buf0 AS storage_dynamic DESCRIPTOR_SET 0 BINDING 0 OFFSET 0 + # Using the maximum possible required offset alignment of 256 bytes to support all implementations. + BIND BUFFER buf1 AS storage_dynamic DESCRIPTOR_SET 0 BINDING 1 OFFSET 256 +END + +RUN pipeline 1 1 1 + +EXPECT buf0 IDX 0 EQ 1.0 2.0 3.0 4.0 +EXPECT buf1 IDX 256 EQ 5.0 6.0 7.0 8.0 diff --git a/tests/cases/compute_dynamic_buffers_descriptor_array.amber b/tests/cases/compute_dynamic_buffers_descriptor_array.amber new file mode 100644 index 0000000..fe07b6c --- /dev/null +++ b/tests/cases/compute_dynamic_buffers_descriptor_array.amber @@ -0,0 +1,48 @@ +#!amber +# Copyright 2020 The Amber Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SHADER compute compute_shader GLSL +#version 430 + +layout(set = 0, binding = 0) buffer block0 +{ + vec4 data; +} ssbo_array[2]; + +void main() +{ + ssbo_array[0].data = vec4(1, 2, 3, 4); + ssbo_array[1].data = vec4(5, 6, 7, 8); +} +END + +# The Vulkan spec lists the maximum value of minStorageBufferOffsetAlignment +# (i.e. the maximum possible alignment requirement) as 256 bytes. +# Allocate enough space to hold one vec4 (each 16 bytes) +# after the alignment (256 / 16 + 1). +BUFFER buf0 DATA_TYPE vec4<float> SIZE 17 FILL 0.0 +BUFFER buf1 DATA_TYPE vec4<float> SIZE 17 FILL 0.0 + +PIPELINE compute pipeline + ATTACH compute_shader + + # Using the maximum possible required offset alignment of 256 bytes to support all implementations. + BIND BUFFER_ARRAY buf0 buf1 AS storage_dynamic DESCRIPTOR_SET 0 BINDING 0 OFFSET 0 256 +END + +RUN pipeline 1 1 1 + +EXPECT buf0 IDX 0 EQ 1.0 2.0 3.0 4.0 +EXPECT buf1 IDX 256 EQ 5.0 6.0 7.0 8.0 diff --git a/tests/cases/graphics_dynamic_buffers.amber b/tests/cases/graphics_dynamic_buffers.amber new file mode 100644 index 0000000..ff48d74 --- /dev/null +++ b/tests/cases/graphics_dynamic_buffers.amber @@ -0,0 +1,135 @@ +#!amber +# Copyright 2020 The Amber Authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +SHADER vertex vtex_shader_uniform GLSL +#version 430 + +layout(location = 0) in vec4 position; +layout(location = 0) out vec4 frag_color; + +layout(set = 0, binding = 0) readonly uniform block0 +{ + vec4 in_color; +}; + +void main() +{ + gl_Position = position; + frag_color = in_color; +} +END + +SHADER vertex vtex_shader_storage GLSL +#version 430 + +layout(location = 0) in vec4 position; +layout(location = 0) out vec4 frag_color; + +layout(set = 0, binding = 1) readonly buffer block0 +{ + vec4 in_color; +}; + +void main() +{ + gl_Position = position; + frag_color = in_color; +} +END + +SHADER fragment frag_shader GLSL +#version 430 + +layout(location = 0) in vec4 frag_color; +layout(location = 0) out vec4 final_color; + +void main() +{ + final_color = frag_color; +} +END + +# The Vulkan spec lists the maximum value of minStorageBufferOffsetAlignment +# (i.e. the maximum possible alignment requirement) as 256 bytes. +# Meaningful data is placed at this offset. +BUFFER buf DATA_TYPE vec4<float> DATA +1.0 0.0 0.0 1.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 1.0 0.0 1.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 0.0 0.0 +0.0 0.0 1.0 1.0 +END + +BUFFER framebuffer FORMAT B8G8R8A8_UNORM + +PIPELINE graphics pipeline0 + ATTACH vtex_shader_uniform + ATTACH frag_shader + + # Using the maximum possible required offset alignment of 256 bytes to support all implementations. + BIND BUFFER buf AS uniform_dynamic DESCRIPTOR_SET 0 BINDING 0 OFFSET 256 + BIND BUFFER framebuffer AS color LOCATION 0 + + FRAMEBUFFER_SIZE 256 256 +END + +PIPELINE graphics pipeline1 + ATTACH vtex_shader_storage + ATTACH frag_shader + + # Using the maximum possible required offset alignment of 256 bytes to support all implementations. + BIND BUFFER buf AS storage_dynamic DESCRIPTOR_SET 0 BINDING 1 OFFSET 512 + BIND BUFFER framebuffer AS color LOCATION 0 + + FRAMEBUFFER_SIZE 256 256 +END + +CLEAR_COLOR pipeline0 0 0 0 255 +CLEAR pipeline0 +RUN pipeline0 DRAW_RECT POS 0 0 SIZE 128 128 +RUN pipeline1 DRAW_RECT POS 128 128 SIZE 128 128 + +EXPECT framebuffer IDX 0 0 SIZE 128 128 EQ_RGBA 0 255 0 255 +EXPECT framebuffer IDX 128 0 SIZE 128 128 EQ_RGBA 0 0 0 255 +EXPECT framebuffer IDX 128 128 SIZE 128 128 EQ_RGBA 0 0 255 255 +EXPECT framebuffer IDX 0 128 SIZE 128 128 EQ_RGBA 0 0 0 255 |