aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJean-Luc Brouillet <jeanluc@google.com>2015-04-02 22:43:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2015-04-02 22:44:11 +0000
commit91eae4ae72f5f8ed251c270082abb0d18a2922c5 (patch)
tree7eeabccd4fbc1aa02b2b123b412d78dac55a6d82
parentde68eb690fd276be775088372a9b80edac2f52f1 (diff)
parent3ff3b313509d39f20740a7cbfd8420081d2bdca4 (diff)
downloadandroid_frameworks_compile_slang-91eae4ae72f5f8ed251c270082abb0d18a2922c5.tar.gz
android_frameworks_compile_slang-91eae4ae72f5f8ed251c270082abb0d18a2922c5.tar.bz2
android_frameworks_compile_slang-91eae4ae72f5f8ed251c270082abb0d18a2922c5.zip
Merge "Change the list of recognized .rsh files"
-rw-r--r--slang_rs.cpp18
1 files changed, 9 insertions, 9 deletions
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 @@ namespace slang {
/* 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) {