Added descriptor array support (#867)

Fixes #866

6 files changed, 361 insertions, 11 deletions

diff --git a/tests/cases/compute_descriptor_array_ssbo.amber b/tests/cases/compute_descriptor_array_ssbo.amber
new file mode 100644
index 0000000..bd4c773
--- /dev/null
+++ b/tests/cases/compute_descriptor_array_ssbo.amber
@@ -0,0 +1,49 @@
+#!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 450
+layout(local_size_x = 1, local_size_y = 1, local_size_z = 1) in;
+
+layout(binding = 0) buffer block0
+{
+    int data;
+} ssbo_array[2];
+
+void main()
+{
+    ssbo_array[0].data = 1;
+    ssbo_array[1].data = 2;
+}
+END
+
+BUFFER buf0 DATA_TYPE int32 DATA
+0
+END
+
+BUFFER buf1 DATA_TYPE int32 DATA
+0
+END
+
+PIPELINE compute pipeline
+  ATTACH compute_shader
+
+  BIND BUFFER_ARRAY buf0 buf1 AS storage DESCRIPTOR_SET 0 BINDING 0
+END
+
+RUN pipeline 1 1 1
+
+EXPECT buf0 IDX 0 EQ 1
+EXPECT buf1 IDX 0 EQ 2
diff --git a/tests/cases/compute_descriptor_array_storagetexelbuffer.amber b/tests/cases/compute_descriptor_array_storagetexelbuffer.amber
new file mode 100644
index 0000000..d4a1994
--- /dev/null
+++ b/tests/cases/compute_descriptor_array_storagetexelbuffer.amber
@@ -0,0 +1,63 @@
+#!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(local_size_x=4,local_size_y=1) in;
+uniform layout(set=0, binding=0) samplerBuffer texelsIn;
+uniform layout(set=0, binding=1, rgba32f) imageBuffer texelsOut[2];
+
+void main ()
+{
+    vec4 color = texelFetch(texelsIn, int(gl_GlobalInvocationID));
+    imageStore(texelsOut[0], int(gl_GlobalInvocationID), color);
+    imageStore(texelsOut[1], int(gl_GlobalInvocationID), color * 2.0);
+}
+END
+
+BUFFER texel_buffer_in DATA_TYPE R8G8B8A8_UNORM DATA
+255   0   0 255
+  0 255   0 255
+  0   0 255 255
+  0 255 255 255
+END
+
+BUFFER texel_buffer_out0 DATA_TYPE R32G32B32A32_SFLOAT SIZE 4 FILL 0
+BUFFER texel_buffer_out1 DATA_TYPE R32G32B32A32_SFLOAT SIZE 4 FILL 0
+
+BUFFER ref0 DATA_TYPE R32G32B32A32_SFLOAT DATA
+1.0 0.0 0.0 1.0
+0.0 1.0 0.0 1.0
+0.0 0.0 1.0 1.0
+0.0 1.0 1.0 1.0
+END
+
+BUFFER ref1 DATA_TYPE R32G32B32A32_SFLOAT DATA
+2.0 0.0 0.0 2.0
+0.0 2.0 0.0 2.0
+0.0 0.0 2.0 2.0
+0.0 2.0 2.0 2.0
+END
+
+PIPELINE compute pipeline
+  ATTACH compute_shader
+  BIND BUFFER texel_buffer_in AS uniform_texel_buffer DESCRIPTOR_SET 0 BINDING 0
+  BIND BUFFER_ARRAY texel_buffer_out0 texel_buffer_out1 AS storage_texel_buffer DESCRIPTOR_SET 0 BINDING 1
+END
+
+RUN pipeline 1 1 1
+
+EXPECT texel_buffer_out0 EQ_BUFFER ref0
+EXPECT texel_buffer_out1 EQ_BUFFER ref1
diff --git a/tests/cases/draw_combined_image_sampler.amber b/tests/cases/draw_combined_image_sampler.amber
index 527aa9d..2b0d750 100644
--- a/tests/cases/draw_combined_image_sampler.amber
+++ b/tests/cases/draw_combined_image_sampler.amber
@@ -44,17 +44,6 @@ void main() {
 }
 END
 
-SHADER compute compute_shader GLSL
-#version 430
-layout(local_size_x=16,local_size_y=16) in;
-uniform layout (set=0, binding=0, rgba8) image2D texture;
-void main () {
-  ivec2 uv = ivec2(gl_GlobalInvocationID.xy);
-  vec4 color = imageLoad(texture, uv) + vec4(0, 1.0, 0, 0);
-  imageStore(texture, uv, color);
-}
-END
-
 BUFFER texture FORMAT R8G8B8A8_UNORM
 BUFFER framebuffer FORMAT B8G8R8A8_UNORM
 SAMPLER sampler
diff --git a/tests/cases/graphics_descriptor_array_combined_image_sampler.amber b/tests/cases/graphics_descriptor_array_combined_image_sampler.amber
new file mode 100644
index 0000000..d7fe3c0
--- /dev/null
+++ b/tests/cases/graphics_descriptor_array_combined_image_sampler.amber
@@ -0,0 +1,95 @@
+#!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 vert_shader PASSTHROUGH
+
+SHADER fragment frag_shader_texgen GLSL
+#version 430
+layout(location = 0) out vec4 color_out0;
+layout(location = 1) out vec4 color_out1;
+void main() {
+  color_out0 = vec4(1.0, 0.0, 0.0, 1.0);
+  color_out1 = vec4(0.0, 1.0, 0.0, 1.0);
+}
+END
+
+SHADER vertex vert_shader_tex GLSL
+#version 430
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec2 texcoords_in;
+layout(location = 0) out vec2 texcoords_out;
+void main() {
+  gl_Position = position;
+  texcoords_out = texcoords_in;
+}
+END
+
+SHADER fragment frag_shader_tex GLSL
+#version 430
+layout(location = 0) in vec2 texcoords_in;
+layout(location = 0) out vec4 color_out;
+uniform layout(set=0, binding=0) sampler2D tex_sampler[2];
+void main() {
+  color_out = texture(tex_sampler[0], texcoords_in);
+  color_out = color_out + texture(tex_sampler[1], texcoords_in);
+}
+END
+
+IMAGE texture0 FORMAT R8G8B8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+IMAGE texture1 FORMAT R8G8B8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+IMAGE framebuffer FORMAT B8G8R8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+SAMPLER sampler
+BUFFER position DATA_TYPE vec2<float> DATA
+-0.75 -0.75
+ 0.75 -0.75
+ 0.75  0.75
+-0.75  0.75
+END
+BUFFER texcoords DATA_TYPE vec2<float> DATA
+0.0 0.0
+2.0 0.0
+2.0 2.0
+0.0 2.0
+END
+
+PIPELINE graphics texgen
+  ATTACH vert_shader
+  ATTACH frag_shader_texgen
+  BIND BUFFER texture0 AS color LOCATION 0
+  BIND BUFFER texture1 AS color LOCATION 1
+END
+
+PIPELINE graphics pipeline
+  ATTACH vert_shader_tex
+  ATTACH frag_shader_tex
+  BIND BUFFER_ARRAY texture0 texture1 AS combined_image_sampler SAMPLER sampler DESCRIPTOR_SET 0 BINDING 0
+  VERTEX_DATA position LOCATION 0
+  VERTEX_DATA texcoords LOCATION 1
+  BIND BUFFER framebuffer AS color LOCATION 0
+END
+
+# Generate a texture with a quad at the lower right corner.
+CLEAR_COLOR texgen 0 0 255 255
+CLEAR texgen
+RUN texgen DRAW_RECT POS 128 128 SIZE 128 128
+
+# Draw the texture using a default sampler.
+CLEAR_COLOR pipeline 0 255 0 255
+CLEAR pipeline
+RUN pipeline DRAW_ARRAY AS TRIANGLE_FAN START_IDX 0 COUNT 4
+
+EXPECT framebuffer IDX 1 1 SIZE 1 1 EQ_RGBA 0 255 0 255
+EXPECT framebuffer IDX 81 81 SIZE 1 1 EQ_RGBA 255 255 0 255
+EXPECT framebuffer IDX 81 33 SIZE 1 1 EQ_RGBA 0 0 255 255
diff --git a/tests/cases/graphics_descriptor_array_sampled_image.amber b/tests/cases/graphics_descriptor_array_sampled_image.amber
new file mode 100644
index 0000000..497f6da
--- /dev/null
+++ b/tests/cases/graphics_descriptor_array_sampled_image.amber
@@ -0,0 +1,97 @@
+#!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 vert_shader PASSTHROUGH
+
+SHADER fragment frag_shader_texgen GLSL
+#version 430
+layout(location = 0) out vec4 color_out0;
+layout(location = 1) out vec4 color_out1;
+void main() {
+  color_out0 = vec4(1.0, 0.0, 0.0, 1.0);
+  color_out1 = vec4(0.0, 1.0, 0.0, 1.0);
+}
+END
+
+SHADER vertex vert_shader_tex GLSL
+#version 430
+layout(location = 0) in vec4 position;
+layout(location = 1) in vec2 texcoords_in;
+layout(location = 0) out vec2 texcoords_out;
+void main() {
+  gl_Position = position;
+  texcoords_out = texcoords_in;
+}
+END
+
+SHADER fragment frag_shader_tex GLSL
+#version 430
+layout(location = 0) in vec2 texcoords_in;
+layout(location = 0) out vec4 color_out;
+uniform layout(set=0, binding=0) texture2D tex[2];
+uniform layout(set=0, binding=1) sampler tex_sampler;
+void main() {
+  color_out = texture(sampler2D(tex[0], tex_sampler), texcoords_in);
+  color_out += texture(sampler2D(tex[1], tex_sampler), texcoords_in);
+}
+END
+
+IMAGE texture0 FORMAT R8G8B8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+IMAGE texture1 FORMAT R8G8B8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+IMAGE framebuffer FORMAT B8G8R8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+SAMPLER sampler
+BUFFER position DATA_TYPE vec2<float> DATA
+-0.75 -0.75
+ 0.75 -0.75
+ 0.75  0.75
+-0.75  0.75
+END
+BUFFER texcoords DATA_TYPE vec2<float> DATA
+0.0 0.0
+2.0 0.0
+2.0 2.0
+0.0 2.0
+END
+
+PIPELINE graphics pipeline_texgen
+  ATTACH vert_shader
+  ATTACH frag_shader_texgen
+  BIND BUFFER texture0 AS color LOCATION 0
+  BIND BUFFER texture1 AS color LOCATION 1
+END
+
+PIPELINE graphics pipeline
+  ATTACH vert_shader_tex
+  ATTACH frag_shader_tex
+  BIND BUFFER_ARRAY texture0 texture1 AS sampled_image DESCRIPTOR_SET 0 BINDING 0
+  BIND SAMPLER sampler DESCRIPTOR_SET 0 BINDING 1
+  VERTEX_DATA position LOCATION 0
+  VERTEX_DATA texcoords LOCATION 1
+  BIND BUFFER framebuffer AS color LOCATION 0
+END
+
+# Generate a texture with a quad at the lower right corner.
+CLEAR_COLOR pipeline_texgen 0 0 255 255
+CLEAR pipeline_texgen
+RUN pipeline_texgen DRAW_RECT POS 128 128 SIZE 128 128
+
+# Draw the texture using a default sampler.
+CLEAR_COLOR pipeline 0 255 0 255
+CLEAR pipeline
+RUN pipeline DRAW_ARRAY AS TRIANGLE_FAN START_IDX 0 COUNT 4
+
+EXPECT framebuffer IDX 1 1 SIZE 1 1 EQ_RGBA 0 255 0 255
+EXPECT framebuffer IDX 81 81 SIZE 1 1 EQ_RGBA 255 255 0 255
+EXPECT framebuffer IDX 81 33 SIZE 1 1 EQ_RGBA 0 0 255 255
diff --git a/tests/cases/graphics_descriptor_array_sampler.amber b/tests/cases/graphics_descriptor_array_sampler.amber
new file mode 100644
index 0000000..8c6df32
--- /dev/null
+++ b/tests/cases/graphics_descriptor_array_sampler.amber
@@ -0,0 +1,57 @@
+#!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 vert_shader PASSTHROUGH
+
+SHADER fragment frag_shader GLSL
+#version 430
+layout(location = 0) out vec4 color_out;
+uniform layout(set=0, binding=0) texture2D tex;
+uniform layout(set=0, binding=1) sampler tex_sampler[2];
+void main() {
+  // Sample outside texture to get border color.
+  vec4 black = texture(sampler2D(tex, tex_sampler[0]), vec2(2.0));
+  vec4 white = texture(sampler2D(tex, tex_sampler[1]), vec2(2.0));
+  color_out = vec4(white.x, black.y, white.z, black.w);
+}
+END
+
+IMAGE texture FORMAT R8G8B8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+IMAGE framebuffer FORMAT B8G8R8A8_UNORM DIM_2D WIDTH 256 HEIGHT 256
+SAMPLER sampler0 ADDRESS_MODE_U clamp_to_border BORDER_COLOR float_opaque_black
+SAMPLER sampler1 ADDRESS_MODE_U clamp_to_border BORDER_COLOR float_opaque_white
+
+BUFFER position DATA_TYPE vec2<float> DATA
+-0.75 -0.75
+ 0.75 -0.75
+ 0.75  0.75
+-0.75  0.75
+END
+
+PIPELINE graphics pipeline
+  ATTACH vert_shader
+  ATTACH frag_shader
+  BIND BUFFER texture AS sampled_image DESCRIPTOR_SET 0 BINDING 0
+  BIND SAMPLER_ARRAY sampler0 sampler1 DESCRIPTOR_SET 0 BINDING 1
+  VERTEX_DATA position LOCATION 0
+  BIND BUFFER framebuffer AS color LOCATION 0
+END
+
+CLEAR_COLOR pipeline 0 0 0 255
+CLEAR pipeline
+RUN pipeline DRAW_ARRAY AS TRIANGLE_FAN START_IDX 0 COUNT 4
+
+EXPECT framebuffer IDX 1 1 SIZE 1 1 EQ_RGBA 0 0 0 255
+EXPECT framebuffer IDX 128 128 SIZE 1 1 EQ_RGBA 255 0 255 255