commit cec57d041458f6bef1d8491d14971ebe154d46f2
author Jason Sams <jsams@google.com> Thu Mar 26 20:47:40 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Mar 26 20:47:40 2015 +0000
tree 646df9b6531290af6ba674d45d3d15bb71eacd4b
parent f0673662127c2d93aa1d77f510ee943e7c72736d
parent 8e29f3f3c51583f283fc9afa08bb5cfabcd87ad2

Merge "Revert "Change the list of recognized .rsh files""

slang_rs.cpp

diff --git a/slang_rs.cpp b/slang_rs.cpp
index a388bfa..88eb909 100644
--- a/slang_rs.cpp
+++ b/slang_rs.cpp
@@ -48,23 +48,23 @@
 
 /* RS_HEADER_ENTRY(name) */
 #define ENUM_RS_HEADER()  \
-  RS_HEADER_ENTRY(rs_allocation_data) \
+  RS_HEADER_ENTRY(rs_allocation) \
   RS_HEADER_ENTRY(rs_atomic) \
-  RS_HEADER_ENTRY(rs_convert) \
+  RS_HEADER_ENTRY(rs_cl) \
   RS_HEADER_ENTRY(rs_core) \
+  RS_HEADER_ENTRY(rs_core_math) \
   RS_HEADER_ENTRY(rs_debug) \
-  RS_HEADER_ENTRY(rs_for_each) \
+  RS_HEADER_ENTRY(rs_element) \
   RS_HEADER_ENTRY(rs_graphics) \
-  RS_HEADER_ENTRY(rs_graphics_types) \
-  RS_HEADER_ENTRY(rs_io) \
   RS_HEADER_ENTRY(rs_math) \
+  RS_HEADER_ENTRY(rs_mesh) \
   RS_HEADER_ENTRY(rs_matrix) \
-  RS_HEADER_ENTRY(rs_object_info) \
-  RS_HEADER_ENTRY(rs_object_types) \
+  RS_HEADER_ENTRY(rs_object) \
+  RS_HEADER_ENTRY(rs_program) \
   RS_HEADER_ENTRY(rs_quaternion) \
+  RS_HEADER_ENTRY(rs_sampler) \
   RS_HEADER_ENTRY(rs_time) \
-  RS_HEADER_ENTRY(rs_value_types) \
-  RS_HEADER_ENTRY(rs_vector_math) \
+  RS_HEADER_ENTRY(rs_types) \
 
 // Returns true if \p Filename ends in ".fs".
 bool SlangRS::isFilterscript(const char *Filename) {