Add sampler and sampler image support (google#705)

Fixes google#417

Android.mk

@@ -36,6 +36,7 @@ LOCAL_SRC_FILES:= \
     src/pipeline_data.cc \
     src/recipe.cc \
     src/result.cc \
+    src/sampler.cc \
     src/script.cc \
     src/shader.cc \
     src/shader_compiler.cc \
@@ -49,6 +50,7 @@ LOCAL_SRC_FILES:= \
     src/vkscript/parser.cc \
     src/vkscript/section_parser.cc \
     src/vulkan/buffer_descriptor.cc \
+    src/vulkan/buffer_backed_descriptor.cc \
     src/vulkan/command_buffer.cc \
     src/vulkan/command_pool.cc \
     src/vulkan/compute_pipeline.cc \
@@ -62,6 +64,7 @@ LOCAL_SRC_FILES:= \
     src/vulkan/pipeline.cc \
     src/vulkan/push_constant.cc \
     src/vulkan/resource.cc \
+    src/vulkan/sampler_descriptor.cc \
     src/vulkan/transfer_buffer.cc \
     src/vulkan/transfer_image.cc \
     src/vulkan/vertex_buffer.cc \

docs/amber_script.md

@@ -237,8 +237,8 @@ The following commands are all specified within the `PIPELINE` command.
 
 TODO(dsinclair): Sync the BufferTypes with the list of Vulkan Descriptor types.
 
-A `pipeline` can have buffers bound. This includes buffers to contain image
-attachment content, depth/stencil content, uniform buffers, etc.
+A `pipeline` can have buffers or samplers bound. This includes buffers to
+contain image attachment content, depth/stencil content, uniform buffers, etc.
 
 ```groovy
   # Attach |buffer_name| as an output color attachment at location |idx|.
@@ -255,13 +255,21 @@ attachment content, depth/stencil content, uniform buffers, etc.
 
   # Attach |buffer_name| as the push_constant buffer. There can be only one
   # push constant buffer attached to a pipeline.
-  BIND BUFFER <buffer_name> AS push_constant
+  BIND BUFFER {buffer_name} AS push_constant
 
   # Bind the buffer of the given |buffer_type| at the given descriptor set
   # and binding. The buffer will use a start index of 0.
   BIND BUFFER {buffer_name} AS {buffer_type} DESCRIPTOR_SET _id_ \
        BINDING _id_
 
+  # Attach |buffer_name| as a storage image. The provided buffer must
+  # be a `FORMAT` buffer.
+  BIND BUFFER {buffer_name} AS storage_image
+
+  # Attach |buffer_name| as a sampled image. The provided buffer must
+  # be a `FORMAT` buffer.
+  BIND BUFFER {buffer_name} AS sampled_image
+
   # Bind the sampler at the given descriptor set and binding.
   BIND SAMPLER {sampler_name} DESCRIPTOR_SET _id_ BINDING _id_
 

src/CMakeLists.txt

@@ -27,10 +27,11 @@ set(AMBER_SOURCES
     pipeline_data.cc
     recipe.cc
     result.cc
-    sleep.cc
+    sampler.cc
     script.cc
     shader.cc
     shader_compiler.cc
+    sleep.cc
     tokenizer.cc
     type.cc
     type_parser.cc
@@ -127,6 +128,7 @@ if (${AMBER_ENABLE_TESTS})
     amberscript/parser_pipeline_set_test.cc
     amberscript/parser_repeat_test.cc
     amberscript/parser_run_test.cc
+    amberscript/parser_sampler_test.cc
     amberscript/parser_set_test.cc
     amberscript/parser_shader_opt_test.cc
     amberscript/parser_shader_test.cc