mojoshader_parser_hlsl.lemon
changeset 724 e96f140736f0
parent 722 d483a61ef502
child 725 5e3c35b63abd
--- a/mojoshader_parser_hlsl.lemon	Fri Mar 06 22:56:44 2009 -0500
+++ b/mojoshader_parser_hlsl.lemon	Fri Mar 06 22:58:21 2009 -0500
@@ -170,6 +170,8 @@
 variable_declaration ::= datatype scalar_or_array SEMICOLON.
 variable_declaration ::= struct_declaration scalar_or_array SEMICOLON.
 
+// !!! FIXME: we don't handle full sampler declarations at the moment.
+
 struct_declaration ::= STRUCT identifier LBRACE struct_member_list RBRACE.
 
 struct_member_list ::= struct_member.
@@ -220,10 +222,20 @@
 intrinsic_datatype ::= datatype_vector.
 intrinsic_datatype ::= datatype_matrix.
 intrinsic_datatype ::= datatype_scalar.
+intrinsic_datatype ::= datatype_sampler.
 
 datatype ::= intrinsic_datatype.
 datatype ::= USERTYPE.
 
+datatype_sampler ::= SAMPLER.
+datatype_sampler ::= SAMPLER1D.
+datatype_sampler ::= SAMPLER2D.
+datatype_sampler ::= SAMPLER3D.
+datatype_sampler ::= SAMPLERCUBE.
+datatype_sampler ::= SAMPLER_STATE.
+datatype_sampler ::= SAMPLERSTATE.
+datatype_sampler ::= SAMPLERCOMPARISONSTATE.
+
 datatype_scalar ::= BOOL.
 datatype_scalar ::= INT.
 datatype_scalar ::= UINT.