commit b9feea567b6b8a9a5d7737f9738456c367c2587b
author Jean-Luc Brouillet <jeanluc@google.com> Thu Mar 26 19:23:08 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Mar 26 19:23:08 2015 +0000
tree 6ac4bcb70f163f12e35473b61067e2415cf58387
parent 1a72ba521775741cf77f2746ee544339a679a672
parent f0673662127c2d93aa1d77f510ee943e7c72736d

am f0673662: Merge "Change the list of recognized .rsh files"

* commit 'f0673662127c2d93aa1d77f510ee943e7c72736d':
  Change the list of recognized .rsh files

slang_rs.cpp

diff --git a/slang_rs.cpp b/slang_rs.cpp
index 88eb909..a388bfa 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) \
+  RS_HEADER_ENTRY(rs_allocation_data) \
   RS_HEADER_ENTRY(rs_atomic) \
-  RS_HEADER_ENTRY(rs_cl) \
+  RS_HEADER_ENTRY(rs_convert) \
   RS_HEADER_ENTRY(rs_core) \
-  RS_HEADER_ENTRY(rs_core_math) \
   RS_HEADER_ENTRY(rs_debug) \
-  RS_HEADER_ENTRY(rs_element) \
+  RS_HEADER_ENTRY(rs_for_each) \
   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) \
-  RS_HEADER_ENTRY(rs_program) \
+  RS_HEADER_ENTRY(rs_object_info) \
+  RS_HEADER_ENTRY(rs_object_types) \
   RS_HEADER_ENTRY(rs_quaternion) \
-  RS_HEADER_ENTRY(rs_sampler) \
   RS_HEADER_ENTRY(rs_time) \
-  RS_HEADER_ENTRY(rs_types) \
+  RS_HEADER_ENTRY(rs_value_types) \
+  RS_HEADER_ENTRY(rs_vector_math) \
 
 // Returns true if \p Filename ends in ".fs".
 bool SlangRS::isFilterscript(const char *Filename) {