diff options
author | asuonpaa <34128694+asuonpaa@users.noreply.github.com> | 2020-03-24 14:43:27 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-24 08:43:27 -0400 |
commit | 38fcbe6700f725b80a68168f046ac86020254500 (patch) | |
tree | 09e6984d6b052d418bd4c44e4533e684eee67cbc /tests | |
parent | d4ab26cbc3d53f5dfcb38ede4ea4eadbb6da6be3 (diff) | |
download | amber-38fcbe6700f725b80a68168f046ac86020254500.tar.gz |
Added a support for loading a png file into a buffer (#823)
This CL adds the `FILE` parameter to `BUFFER` commands. This allows loading file data into the buffer. Currently only PNG data is supported.
Diffstat (limited to 'tests')
-rw-r--r-- | tests/cases/draw_png_texture.amber | 66 | ||||
-rw-r--r-- | tests/cases/texture.png | bin | 0 -> 32776 bytes | |||
-rwxr-xr-x | tests/run_tests.py | 2 |
3 files changed, 67 insertions, 1 deletions
diff --git a/tests/cases/draw_png_texture.amber b/tests/cases/draw_png_texture.amber new file mode 100644 index 0000000..c7b9885 --- /dev/null +++ b/tests/cases/draw_png_texture.amber @@ -0,0 +1,66 @@ +#!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_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; +void main() { + color_out = texture(tex_sampler, texcoords_in); +} +END + +BUFFER texture FORMAT R8G8B8A8_UNORM FILE texture.png +BUFFER framebuffer FORMAT B8G8R8A8_UNORM +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 +1.0 0.0 +1.0 1.0 +0.0 1.0 +END + +PIPELINE graphics pipeline + ATTACH vert_shader_tex + ATTACH frag_shader_tex + BIND BUFFER texture AS combined_image_sampler SAMPLER sampler DESCRIPTOR_SET 0 BINDING 0 + VERTEX_DATA position LOCATION 0 + VERTEX_DATA texcoords LOCATION 1 + FRAMEBUFFER_SIZE 256 256 + BIND BUFFER framebuffer AS color LOCATION 0 +END + +# 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 diff --git a/tests/cases/texture.png b/tests/cases/texture.png Binary files differnew file mode 100644 index 0000000..465bf9a --- /dev/null +++ b/tests/cases/texture.png diff --git a/tests/run_tests.py b/tests/run_tests.py index b3903cd..6b17f56 100755 --- a/tests/run_tests.py +++ b/tests/run_tests.py @@ -323,7 +323,7 @@ class TestRunner: print("--test-prog-path must point to an executable") return 1 - input_file_re = re.compile('^.+[.][amber|vkscript]') + input_file_re = re.compile('^.+[\.]amber|vkscript') self.test_cases = [] if self.args: |