1 files changed, 37 insertions, 18 deletions

diff --git a/intern/opensubdiv/internal/evaluator/eval_output.h b/intern/opensubdiv/internal/evaluator/eval_output.h
index 57a9fab490f..e8480e8d816 100644
--- a/intern/opensubdiv/internal/evaluator/eval_output.h
+++ b/intern/opensubdiv/internal/evaluator/eval_output.h
@@ -107,6 +107,10 @@ class EvalOutputAPI::EvalOutput {
   {
   }
 
+  virtual void wrapSrcVertexDataBuffer(OpenSubdiv_Buffer * /*src_buffer*/)
+  {
+  }
+
   virtual void fillFVarPatchArraysBuffer(const int /*face_varying_channel*/,
                                          OpenSubdiv_Buffer * /*patch_arrays_buffer*/)
   {
@@ -126,6 +130,11 @@ class EvalOutputAPI::EvalOutput {
                                  OpenSubdiv_Buffer * /*src_buffer*/)
   {
   }
+
+  virtual bool hasVertexData() const
+  {
+    return false;
+  }
 };
 
 namespace {
@@ -367,15 +376,15 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
                                                                        device_context_);
 
     // Create evaluators for every face varying channel.
-    face_varying_evaluators.reserve(all_face_varying_stencils.size());
+    face_varying_evaluators_.reserve(all_face_varying_stencils.size());
     int face_varying_channel = 0;
     for (const StencilTable *face_varying_stencils : all_face_varying_stencils) {
-      face_varying_evaluators.push_back(new FaceVaryingEval(face_varying_channel,
-                                                            face_varying_stencils,
-                                                            face_varying_width,
-                                                            patch_table_,
-                                                            evaluator_cache_,
-                                                            device_context_));
+      face_varying_evaluators_.push_back(new FaceVaryingEval(face_varying_channel,
+                                                             face_varying_stencils,
+                                                             face_varying_width,
+                                                             patch_table_,
+                                                             evaluator_cache_,
+                                                             device_context_));
       ++face_varying_channel;
     }
   }
@@ -388,7 +397,7 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
     delete patch_table_;
     delete vertex_stencils_;
     delete varying_stencils_;
-    for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators) {
+    for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators_) {
       delete face_varying_evaluator;
     }
   }
@@ -433,8 +442,8 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
                              int num_vertices) override
   {
     assert(face_varying_channel >= 0);
-    assert(face_varying_channel < face_varying_evaluators.size());
-    face_varying_evaluators[face_varying_channel]->updateData(src, start_vertex, num_vertices);
+    assert(face_varying_channel < face_varying_evaluators_.size());
+    face_varying_evaluators_[face_varying_channel]->updateData(src, start_vertex, num_vertices);
   }
 
   bool hasVaryingData() const
@@ -446,7 +455,12 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
 
   bool hasFaceVaryingData() const
   {
-    return face_varying_evaluators.size() != 0;
+    return face_varying_evaluators_.size() != 0;
+  }
+
+  bool hasVertexData() const override
+  {
+    return src_vertex_data_ != nullptr;
   }
 
   void refine() override
@@ -495,7 +509,7 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
     }
     // Evaluate face-varying data.
     if (hasFaceVaryingData()) {
-      for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators) {
+      for (FaceVaryingEval *face_varying_evaluator : face_varying_evaluators_) {
         face_varying_evaluator->refine();
       }
     }
@@ -601,8 +615,8 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
                               float face_varying[2]) override
   {
     assert(face_varying_channel >= 0);
-    assert(face_varying_channel < face_varying_evaluators.size());
-    face_varying_evaluators[face_varying_channel]->evalPatches(
+    assert(face_varying_channel < face_varying_evaluators_.size());
+    face_varying_evaluators_[face_varying_channel]->evalPatches(
         patch_coord, num_patch_coords, face_varying);
   }
 
@@ -611,6 +625,11 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
     return src_data_;
   }
 
+  SRC_VERTEX_BUFFER *getSrcVertexDataBuffer() const
+  {
+    return src_vertex_data_;
+  }
+
   PATCH_TABLE *getPatchTable() const
   {
     return patch_table_;
@@ -618,17 +637,17 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
 
   SRC_VERTEX_BUFFER *getFVarSrcBuffer(const int face_varying_channel) const
   {
-    return face_varying_evaluators[face_varying_channel]->getSrcBuffer();
+    return face_varying_evaluators_[face_varying_channel]->getSrcBuffer();
   }
 
   int getFVarSrcBufferOffset(const int face_varying_channel) const
   {
-    return face_varying_evaluators[face_varying_channel]->getFVarSrcBufferOffset();
+    return face_varying_evaluators_[face_varying_channel]->getFVarSrcBufferOffset();
   }
 
   PATCH_TABLE *getFVarPatchTable(const int face_varying_channel) const
   {
-    return face_varying_evaluators[face_varying_channel]->getPatchTable();
+    return face_varying_evaluators_[face_varying_channel]->getPatchTable();
   }
 
  private:
@@ -646,7 +665,7 @@ class VolatileEvalOutput : public EvalOutputAPI::EvalOutput {
   const STENCIL_TABLE *varying_stencils_;
 
   int face_varying_width_;
-  vector<FaceVaryingEval *> face_varying_evaluators;
+  vector<FaceVaryingEval *> face_varying_evaluators_;
 
   EvaluatorCache *evaluator_cache_;
   DEVICE_CONTEXT *device_context_;