aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authordan sinclair <dj2@everburning.com>2018-11-22 16:03:37 -0500
committerDavid Neto <dneto@google.com>2018-11-22 16:03:37 -0500
commitdf5530e7cfa3e47680e94dcff8a9332d5b45d193 (patch)
tree32ed2f68df8279ab8cf4315337c34e11ef121527 /tools
parentd7bda5c52d2360c7f33a76604cea4e070da7a72e (diff)
downloadamber-df5530e7cfa3e47680e94dcff8a9332d5b45d193.tar.gz
Framebuffer updates (#89)
Framebuffer updates This Cl removes the FRAMEBUFFER commands from AmberScript and converts them into more generic buffer commands.
Diffstat (limited to 'tools')
-rw-r--r--tools/amber-syntax.vim6
-rw-r--r--tools/amber.sublime-syntax6
2 files changed, 7 insertions, 5 deletions
diff --git a/tools/amber-syntax.vim b/tools/amber-syntax.vim
index dc176e6..e2695c3 100644
--- a/tools/amber-syntax.vim
+++ b/tools/amber-syntax.vim
@@ -33,8 +33,8 @@ syn keyword amberBlockCmd DESCRIPTOR_SET BINDING IDX TO EXPECT PASSTHROUGH
syn keyword amberBlockCmd DATA_TYPE DIMS DATA SERIES_FROM DRAW_ARRAY IN START_IDX
syn keyword amberBlockCmd COUNT CLEAR CLEAR_COLOR AS POS DRAW_RECT INC_BY
syn keyword amberBlockCmd FRAMEBUFFER ENTRY_POINT SHADER_OPTIMIZATION
-syn keyword amberBlockCmd FORMAT RENDER_SIZE BIND SAMPLER VERTEX_DATA INDEX_DATA
-syn keyword amberBlockCmd INDEXED
+syn keyword amberBlockCmd FORMAT FRAMEBUFFER_SIZE BIND SAMPLER VERTEX_DATA INDEX_DATA
+syn keyword amberBlockCmd INDEXED IMAGE_ATTACHMENT DEPTH_STENCIL_ATTACHMENT
syn keyword amberComparator EQ NE LT LE GT GE EQ_RGB EQ_RGBA
@@ -49,7 +49,7 @@ syn keyword amberTopology triangle_list_with_adjacench triangle_strip
syn keyword amberTopology triangle_strip_with_adjacency triangle_fan patch_list
syn keyword amberBufferType uniform storage vertex index sampled storage color
-syn keyword amberBufferType framebuffer depth
+syn keyword amberBufferType framebuffer depth image depth_stencil
let b:current_syntax = "amber"
hi def link amberTodo Todo
diff --git a/tools/amber.sublime-syntax b/tools/amber.sublime-syntax
index b85a4bf..faf72db 100644
--- a/tools/amber.sublime-syntax
+++ b/tools/amber.sublime-syntax
@@ -25,14 +25,16 @@ contexts:
scope: keyword.control.amber
- match: '\b(COUNT|CLEAR_COLOR|CLEAR|EXPECT|TYPE|FRAMEBUFFER|SHADER_OPTIMIZATION)\b'
scope: keyword.control.amber
- - match: '\b(FORMAT|RENDER_SIZE|BIND|SAMPLER|VERTEX_DATA|INDEX_DATA|INDEXED)\b'
+ - match: '\b(FORMAT|FRAMEBUFFER_SIZE|BIND|SAMPLER|VERTEX_DATA|INDEX_DATA|INDEXED)\b'
+ scope: keyword.control.amber
+ - match : '\b(IMAGE_ATTACHMENT|DEPTH_STENCIL_ATTACHMENT)\b'
scope: keyword.control.amber
- match: '\b(vertex|fragment|compute|geometry|tessellation_evaluation|tessellation_control)\b'
scope: constant.character.escape.amber
- match: '\b(framebuffer|graphics)\b'
scope: constant.character.escape.amber
- - match: '\b(uniform|storage|index|sampled|storage|color|depth)\b'
+ - match: '\b(uniform|storage|index|sampled|storage|color|depth|image|depth_stencil)\b'
scope: constant.character.escape.amber
- match: '\b(EQ|NE|LT|LE|GT|GE|EQ_RGB|EQ_RGBA)\b'
scope: constant.character.esape.amber