commit 40cbb1696d6182a165ec9b16e81bf994810de5b3
author Logan Chien <loganchien@google.com> Sat Nov 26 01:34:27 2011 -0800
committer Android Git Automerger <android-git-automerger@android.com> Sat Nov 26 01:34:27 2011 -0800
tree 09909f407f5baa71c7cafda66a6426f6032c10e8
parent 903a2ffdbdb9ebb372cf33cad04bf7c9a161fa63
parent fa6ef56a6ca3dc3061218a75a7e68e5357fcb82c

am fa6ef56a: Apply changes to migrate to upstream (Nov 25th 2011).

* commit 'fa6ef56a6ca3dc3061218a75a7e68e5357fcb82c':
  Apply changes to migrate to upstream (Nov 25th 2011).

slang_rs_object_ref_count.cpp

diff --git a/slang_rs_object_ref_count.cpp b/slang_rs_object_ref_count.cpp
index 7362d7a..a86088c 100644
--- a/slang_rs_object_ref_count.cpp
+++ b/slang_rs_object_ref_count.cpp
@@ -1344,6 +1344,7 @@
     case RSExportPrimitiveType::DataTypeRSSampler:
     case RSExportPrimitiveType::DataTypeRSScript:
     case RSExportPrimitiveType::DataTypeRSMesh:
+    case RSExportPrimitiveType::DataTypeRSPath:
     case RSExportPrimitiveType::DataTypeRSProgramFragment:
     case RSExportPrimitiveType::DataTypeRSProgramVertex:
     case RSExportPrimitiveType::DataTypeRSProgramRaster:

slang_rs_reflection.cpp

diff --git a/slang_rs_reflection.cpp b/slang_rs_reflection.cpp
index 454946f..dab35ed 100644
--- a/slang_rs_reflection.cpp
+++ b/slang_rs_reflection.cpp
@@ -102,6 +102,7 @@
     "Sampler",      // RSExportPrimitiveType::DataTypeRSSampler
     "Script",       // RSExportPrimitiveType::DataTypeRSScript
     "Mesh",         // RSExportPrimitiveType::DataTypeRSMesh
+    "Path",         // RSExportPrimitiveType::DataTypeRSPath
     "ProgramFragment",  // RSExportPrimitiveType::DataTypeRSProgramFragment
     "ProgramVertex",    // RSExportPrimitiveType::DataTypeRSProgramVertex
     "ProgramRaster",    // RSExportPrimitiveType::DataTypeRSProgramRaster
@@ -302,6 +303,7 @@
     "addObj",   // RSExportPrimitiveType::DataTypeRSSampler
     "addObj",   // RSExportPrimitiveType::DataTypeRSScript
     "addObj",   // RSExportPrimitiveType::DataTypeRSMesh
+    "addObj",   // RSExportPrimitiveType::DataTypeRSPath
     "addObj",   // RSExportPrimitiveType::DataTypeRSProgramFragment
     "addObj",   // RSExportPrimitiveType::DataTypeRSProgramVertex
     "addObj",   // RSExportPrimitiveType::DataTypeRSProgramRaster
@@ -418,6 +420,7 @@
         "Element.SAMPLER",      // RSExportPrimitiveType::DataTypeRSSampler
         "Element.SCRIPT",       // RSExportPrimitiveType::DataTypeRSScript
         "Element.MESH",         // RSExportPrimitiveType::DataTypeRSMesh
+        "Element.PATH",         // RSExportPrimitiveType::DataTypeRSPath
         "Element.PROGRAM_FRAGMENT",
           // RSExportPrimitiveType::DataTypeRSProgramFragment
         "Element.PROGRAM_VERTEX",
@@ -540,6 +543,8 @@
     "Element.DataType.RS_SCRIPT",
       // RSExportPrimitiveType::DataTypeRSMesh
     "Element.DataType.RS_MESH",
+      // RSExportPrimitiveType::DataTypeRSPath
+    "Element.DataType.RS_PATH",
       // RSExportPrimitiveType::DataTypeRSProgramFragment
     "Element.DataType.RS_PROGRAM_FRAGMENT",
       // RSExportPrimitiveType::DataTypeRSProgramVertex
@@ -589,6 +594,7 @@
     "SAMPLER",            // RSExportPrimitiveType::DataTypeRSSampler
     "SCRIPT",             // RSExportPrimitiveType::DataTypeRSScript
     "MESH",               // RSExportPrimitiveType::DataTypeRSMesh
+    "PATH",               // RSExportPrimitiveType::DataTypeRSPath
     "PROGRAM_FRAGMENT",   // RSExportPrimitiveType::DataTypeRSProgramFragment
     "PROGRAM_VERTEX",     // RSExportPrimitiveType::DataTypeRSProgramVertex
     "PROGRAM_RASTER",     // RSExportPrimitiveType::DataTypeRSProgramRaster

slang_rs_type_spec.h

diff --git a/slang_rs_type_spec.h b/slang_rs_type_spec.h
index bd7b157..6e0a3a1 100644
--- a/slang_rs_type_spec.h
+++ b/slang_rs_type_spec.h
@@ -56,6 +56,7 @@
     ENUM_RS_OBJECT_DATA_TYPE(RSSampler, "rs_sampler")                   \
     ENUM_RS_OBJECT_DATA_TYPE(RSScript, "rs_script")                     \
     ENUM_RS_OBJECT_DATA_TYPE(RSMesh, "rs_mesh")                         \
+    ENUM_RS_OBJECT_DATA_TYPE(RSPath, "rs_path")                         \
     ENUM_RS_OBJECT_DATA_TYPE(RSProgramFragment, "rs_program_fragment")  \
     ENUM_RS_OBJECT_DATA_TYPE(RSProgramVertex, "rs_program_vertex")      \
     ENUM_RS_OBJECT_DATA_TYPE(RSProgramRaster, "rs_program_raster")      \