diff options
| -rw-r--r-- | src/amberscript/parser.cc | 2 | ||||
| -rw-r--r-- | tools/amber-syntax.vim | 49 |
2 files changed, 49 insertions, 2 deletions
diff --git a/src/amberscript/parser.cc b/src/amberscript/parser.cc index 810d8f6..525a60f 100644 --- a/src/amberscript/parser.cc +++ b/src/amberscript/parser.cc @@ -940,8 +940,6 @@ Result Parser::ToBufferType(const std::string& name, BufferType* type) { *type = BufferType::kDepthStencil; else if (name == "push_constant") *type = BufferType::kPushConstant; - else if (name == "combined_image_sampler") - *type = BufferType::kCombinedImageSampler; else if (name == "uniform") *type = BufferType::kUniform; else if (name == "uniform_dynamic") diff --git a/tools/amber-syntax.vim b/tools/amber-syntax.vim index dfc77f9..4da5204 100644 --- a/tools/amber-syntax.vim +++ b/tools/amber-syntax.vim @@ -37,8 +37,28 @@ syn keyword amberBlockCmd FORMAT FRAMEBUFFER_SIZE LOCATION BIND SAMPLER syn keyword amberBlockCmd VERTEX_DATA INDEX_DATA INDEXED IMAGE_ATTACHMENT syn keyword amberBlockCmd DEPTH_STENCIL_ATTACHMENT DEVICE_FEATURE TOLERANCE syn keyword amberBlockCmd REPEAT COPY DERIVE_PIPELINE FROM STD140 STD430 +syn keyword amberBlockCmd DEVICE_EXTENSION IMAGE INSTANCE_EXTENSION SET +syn keyword amberBlockCmd STRUCT VIRTUAL_FILE CLEAR_DEPTH CLEAR_STENCIL +syn keyword amberBlockCmd DEBUG TARGET_ENV SHADER_OPTIMIZATION COMPILE_OPTIONS +syn keyword amberBlockCmd POLYGON_MODE DEPTH STENCIL SUBGROUP SPECIALIZE +syn keyword amberBlockCmd FULLY_POPULATED VARYING_SIZE REQUIRED_SIZE +syn keyword amberBlockCmd MIN MAX BUFFER_ARRAY SAMPLER_ARRAY KERNEL OFFSET +syn keyword amberBlockCmd BASE_MIP_LEVEL ARG_NUMBER RATE TEST CLAMP +syn keyword amberBlockCmd WRITE COMPARE_OP BOUNDS BIAS FAIL_OP PASS_OP +syn keyword amberBlockCmd DEPTH_FAIL_OP COMPARE_MASK WRITE_MASK REFERENCE +syn keyword amberBlockCmd STRIDE ARRAY_STRIDE MATRIX_STRIDE MIP_LEVELS +syn keyword amberBlockCmd FILE DIM_1D DIM_2D DIM_3D WIDTH HEIGHT SAMPLES +syn keyword amberBlockCmd TEXT BINARY PNG DRAW_GRID CELLS INSTANCE_COUNT +syn keyword amberBlockCmd START_INSTANCE THREAD GLOBAL_INVOCATION_ID +syn keyword amberBlockCmd VERTEX_INDEX FRAGMENT_WINDOW_SPACE_POSITION +syn keyword amberBlockCmd CALLSTACK STEP_IN STEP_OUT STEP_OVER CONTINUE TO +syn keyword amberBlockCmd ENGINE_DATA MAG_FILTER MIN_FILTER ADDRESS_MODE_U +syn keyword amberBlockCmd ADDRESS_MODE_V ADDRESS_MODE_W BORDER_COLOR +syn keyword amberBlockCmd MIN_LOD MAX_LOD NORMALIZED_COORDS UNNORMALIZED_COORDS +syn keyword amberBlockCmd ARG_NAME syn keyword amberComparator EQ NE LT LE GT GE EQ_RGB EQ_RGBA EQ_BUFFER RMSE_BUFFER +syn keyword amberComparator EQ_HISTOGRAM_EMD_BUFFER syn keyword amberKeyword compute vertex geometry fragment graphics syn keyword amberKeyword tessellation_evaulation tessellation_control multi @@ -51,6 +71,28 @@ 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 push_constant color depth_stencil +syn keyword amberBufferType uniform_dynamic storage_dynamic combined_image_sampler +syn keyword amberBufferType storage_image sampled_image uniform_texel_buffer +syn keyword amberBufferType storage_texel_buffer + +syn keyword amberAddressMode repeat mirrored_repeat clamp_to_edge clamp_to_border +syn keyword amberAddressMode mirror_clamp_to_edge + +syn keyword amberCompareOp never less equal less_or_equal greater not_equal +syn keyword amberCompareOp greater_or_equal always + +syn keyword amberStencilOp keep zero replace increment_and_clamp decrement_and_clamp +syn keyword amberStencilOp invert increment_and_wrap decrement_and_wrap + +syn keyword amberBorderColor float_transparent_black int_transparent_black +syn keyword amberBorderColor float_opaque_black int_opaque_black float_opaque_white +syn keyword amberBorderColor int_opaque_white + +syn keyword amberFace front back front_and_back + +syn keyword amberFilter nearest linear + +syn keyword amberPolygonMode fill line point let b:current_syntax = "amber" hi def link amberTodo Todo @@ -65,3 +107,10 @@ hi def link amberFormat Type hi def link amberComparator Keyword hi def link amberTopology Type hi def link amberBufferType Type +hi def link amberAddressMode Type +hi def link amberCompareOp Type +hi def link amberStencilOp Type +hi def link amberBorderColor Type +hi def link amberFace Type +hi def link amberFilter Type +hi def link amberPolygonMode Type |