Merge pull request #329 from nathan-at-digitalfish/fix_osd_mesh

Fixed omissions in osd/mesh.h
This commit is contained in:
Manuel Kraemer 2014-06-27 07:15:30 -07:00
commit 25b655e777

View File

@ -80,6 +80,8 @@ public:
virtual VertexBufferBinding BindVertexBuffer() = 0; virtual VertexBufferBinding BindVertexBuffer() = 0;
virtual VertexBufferBinding BindVaryingBuffer() = 0; virtual VertexBufferBinding BindVaryingBuffer() = 0;
virtual FarMesh<OsdVertex> const * GetFarMesh() const = 0;
}; };
template <class VERTEX_BUFFER, class COMPUTE_CONTROLLER, class DRAW_CONTEXT> template <class VERTEX_BUFFER, class COMPUTE_CONTROLLER, class DRAW_CONTEXT>
@ -164,23 +166,27 @@ public:
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(), _vertexBuffer, _varyingBuffer); _computeController->Refine(_computeContext, _farMesh->GetKernelBatches(), _vertexBuffer, _varyingBuffer);
} }
virtual void Refine(OsdVertexBufferDescriptor const *vertexDesc, virtual void Refine(OsdVertexBufferDescriptor const *vertexDesc,
OsdVertexBufferDescriptor const *varyingDesc) { OsdVertexBufferDescriptor const *varyingDesc,
bool interleaved) {
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(), _computeController->Refine(_computeContext, _farMesh->GetKernelBatches(),
_vertexBuffer, _varyingBuffer, _vertexBuffer, (interleaved ? _vertexBuffer : _varyingBuffer),
vertexDesc, varyingDesc); vertexDesc, varyingDesc);
} }
virtual void Synchronize() { virtual void Synchronize() {
_computeController->Synchronize(); _computeController->Synchronize();
} }
virtual DrawContext * GetDrawContext() {
return _drawContext;
}
virtual VertexBufferBinding BindVertexBuffer() { virtual VertexBufferBinding BindVertexBuffer() {
return VertexBufferBinding(0); return VertexBufferBinding(0);
} }
virtual VertexBufferBinding BindVaryingBuffer() { virtual VertexBufferBinding BindVaryingBuffer() {
return VertexBufferBinding(0); return VertexBufferBinding(0);
} }
virtual DrawContext * GetDrawContext() { virtual FarMesh<OsdVertex> const * GetFarMesh() const {
return _drawContext; return _farMesh;
} }
private: private: