AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-30 15:20:07 +00:00
Code Issues Releases Wiki Activity
ee061291b7
OpenSubdiv/opensubdiv/osd/glMesh.h

342 lines
12 KiB
C
Raw Normal View History

Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Copyright 2013 Pixar
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Licensed under the Apache License, Version 2.0 (the "Apache License")
// with the following modification; you may not use this file except in
// compliance with the Apache License and the following modification to it:
// Section 6. Trademarks. is deleted and replaced with:
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// 6. Trademarks. This License does not grant permission to use the trade
// names, trademarks, service marks, or product names of the Licensor
// and its affiliates, except as required to comply with Section 4(c) of
// the License and to reproduce the content of the NOTICE file.
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// You may obtain a copy of the Apache License at
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// http://www.apache.org/licenses/LICENSE-2.0
Updating EULA
2013-07-18 21:19:50 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
// Unless required by applicable law or agreed to in writing, software
// distributed under the Apache License with the above modification is
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the Apache License for the specific
// language governing permissions and limitations under the Apache License.
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
//
Amending Apache license language & file headers. New text: Copyright 2013 Pixar Licensed under the Apache License, Version 2.0 (the "Apache License") with the following modification; you may not use this file except in compliance with the Apache License and the following modification to it: Section 6. Trademarks. is deleted and replaced with: 6. Trademarks. This License does not grant permission to use the trade names, trademarks, service marks, or product names of the Licensor and its affiliates, except as required to comply with Section 4(c) of the License and to reproduce the content of the NOTICE file. You may obtain a copy of the Apache License at http://www.apache.org/licenses/LICENSE-2.0 Unless required by applicable law or agreed to in writing, software distributed under the Apache License with the above modification is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the Apache License for the specific language governing permissions and limitations under the Apache License.
2013-09-26 19:04:57 +00:00
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
#ifndef OSD_GL_MESH_H
#define OSD_GL_MESH_H
#include "../version.h"
#include "../osd/mesh.h"
#include "../osd/glDrawContext.h"
Interleaved buffer support in OsdCompute. Removed OsdVertexDescriptor and replaced with OsdVertexBufferDescriptor. All kernels take offset/length/stride to apply subdivision partially in each vertex elements. Also the offset can be used for client-based VBO aggregation, without modifying index buffers. This is useful for topology sharing, in conjunction with glDrawElementsBaseVertex etc. However, gregory patch shader fetches vertex buffer via texture buffer, which index should also be offsetted too. Although gl_BaseVertexARB extension should be able to do that job, it's a relatively new extension. So we use OsdBaseVertex() call to mitigate the compatibility issue as clients can provide it in their way at least for the time being.
2014-05-09 00:20:54 +00:00
#include "../osd/vertexDescriptor.h"
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
#ifdef OPENSUBDIV_HAS_OPENCL
#if defined(__APPLE__)
#include <OpenCL/opencl.h>
#else
#include <CL/opencl.h>
#endif
#include "../osd/clComputeController.h"
#endif
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
typedef OsdMeshInterface<OsdGLDrawContext> OsdGLMeshInterface;
template <class VERTEX_BUFFER, class COMPUTE_CONTROLLER>
class OsdMesh<VERTEX_BUFFER, COMPUTE_CONTROLLER, OsdGLDrawContext> : public OsdGLMeshInterface {
public:
typedef VERTEX_BUFFER VertexBuffer;
typedef COMPUTE_CONTROLLER ComputeController;
typedef typename ComputeController::ComputeContext ComputeContext;
typedef OsdGLDrawContext DrawContext;
typedef typename DrawContext::VertexBufferBinding VertexBufferBinding;
OsdMesh no longer owns its ComputeController Now a ComputeController is passed as an argument to OsdMesh::Create(). This is a better match to the underlying object model and can be much more efficient for compute controllers that have expensive resources, e.g. compiled shader kernels. Fixes #103
2013-02-20 01:33:32 +00:00
OsdMesh(ComputeController * computeController,
HbrMesh<OsdVertex> * hmesh,
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
int numVertexElements,
int numVaryingElements,
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
int level,
OsdMeshBitset bits) :
_farMesh(0),
_vertexBuffer(0),
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
_varyingBuffer(0),
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
_computeContext(0),
OsdMesh no longer owns its ComputeController Now a ComputeController is passed as an argument to OsdMesh::Create(). This is a better match to the underlying object model and can be much more efficient for compute controllers that have expensive resources, e.g. compiled shader kernels. Fixes #103
2013-02-20 01:33:32 +00:00
_computeController(computeController),
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
_drawContext(0)
{
FarMeshFactory<OsdVertex> meshFactory(hmesh, level, bits.test(MeshAdaptive));
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
_farMesh = meshFactory.Create(bits.test(MeshFVarData));
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_initialize(numVertexElements, numVaryingElements, bits);
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
}
OsdMesh(ComputeController * computeController,
FarMesh<OsdVertex> * fmesh,
int numVertexElements,
int numVaryingElements,
OsdMeshBitset bits) :
_farMesh(fmesh),
_vertexBuffer(0),
_varyingBuffer(0),
_computeContext(0),
_computeController(computeController),
_drawContext(0)
{
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_initialize(numVertexElements, numVaryingElements, bits);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Added a public constructor to OsdMesh that initializes the members objects from its arguments, allowing those members to be created by a subclass or an external function. * maintainance work on the D3D11 specialization of OsdMesh to bring it in line with the other template specializations * updated the facePartition example to derive PartitionedMesh from OsdMesh in order to allow other vertex buffer and compute controller configurations
2014-04-19 00:19:08 +00:00
OsdMesh(ComputeController * computeController,
FarMesh<OsdVertex> * fmesh,
VertexBuffer * vertexBuffer,
VertexBuffer * varyingBuffer,
ComputeContext * computeContext,
DrawContext * drawContext) :
_farMesh(fmesh),
_vertexBuffer(vertexBuffer),
_varyingBuffer(varyingBuffer),
_computeContext(computeContext),
_computeController(computeController),
_drawContext(drawContext)
{
_drawContext->UpdateVertexTexture(_vertexBuffer);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual ~OsdMesh() {
delete _farMesh;
delete _vertexBuffer;
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
delete _varyingBuffer;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
delete _computeContext;
delete _drawContext;
}
virtual int GetNumVertices() const { return _farMesh->GetNumVertices(); }
Batching stuffs: generalized kernel batches, table/dispatcher refactoring, multiMeshFactory, drawContext, etc. 2 client APIs are changed. - VertexBuffer::UpdateData() takes start vertex offset - ComputeController::Refine() takes FarKernelBatchVector Also, ComputeContext no longer holds farmesh. Client can free farmesh after OsdComputeContext is created. (but still need FarKernelBatchVector to apply subdivision kernels)
2013-03-08 01:50:15 +00:00
virtual void UpdateVertexBuffer(float const *vertexData, int startVertex, int numVerts) {
_vertexBuffer->UpdateData(vertexData, startVertex, numVerts);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual void UpdateVaryingBuffer(float const *varyingData, int startVertex, int numVerts) {
_varyingBuffer->UpdateData(varyingData, startVertex, numVerts);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual void Refine() {
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(), _vertexBuffer, _varyingBuffer);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Interleaved buffer support in OsdCompute. Removed OsdVertexDescriptor and replaced with OsdVertexBufferDescriptor. All kernels take offset/length/stride to apply subdivision partially in each vertex elements. Also the offset can be used for client-based VBO aggregation, without modifying index buffers. This is useful for topology sharing, in conjunction with glDrawElementsBaseVertex etc. However, gregory patch shader fetches vertex buffer via texture buffer, which index should also be offsetted too. Although gl_BaseVertexARB extension should be able to do that job, it's a relatively new extension. So we use OsdBaseVertex() call to mitigate the compatibility issue as clients can provide it in their way at least for the time being.
2014-05-09 00:20:54 +00:00
virtual void Refine(OsdVertexBufferDescriptor const *vertexDesc,
OsdVertexBufferDescriptor const *varyingDesc,
bool interleaved) {
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(),
_vertexBuffer, (interleaved ? _vertexBuffer : _varyingBuffer),
vertexDesc, varyingDesc);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual void Synchronize() {
_computeController->Synchronize();
}
virtual VertexBufferBinding BindVertexBuffer() {
return _vertexBuffer->BindVBO();
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual VertexBufferBinding BindVaryingBuffer() {
return _varyingBuffer->BindVBO();
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual DrawContext * GetDrawContext() {
return _drawContext;
}
OsdGlMesh : adding accessors for the FarMesh and the VertexBuffer for Scot
2013-06-19 19:55:12 +00:00
virtual VertexBuffer * GetVertexBuffer() {
return _vertexBuffer;
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual VertexBuffer * GetVaryingBuffer() {
return _varyingBuffer;
}
OsdGlMesh : adding accessors for the FarMesh and the VertexBuffer for Scot
2013-06-19 19:55:12 +00:00
virtual FarMesh<OsdVertex> const * GetFarMesh() const {
return _farMesh;
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
private:
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
void _initialize( int numVertexElements,
int numVaryingElements,
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
OsdMeshBitset bits)
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
{
int numVertices = _farMesh->GetNumVertices();
if (numVertexElements)
_vertexBuffer = VertexBuffer::Create(numVertexElements, numVertices);
if (numVaryingElements)
_varyingBuffer = VertexBuffer::Create(numVaryingElements, numVertices);
Remove FarMesh dependency from Osd*Context. The context constructor takes subdivision tables and vertex edit tables directly.
2014-03-28 19:10:13 +00:00
_computeContext = ComputeContext::Create(_farMesh->GetSubdivisionTables(), _farMesh->GetVertexEditTables());
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_drawContext = DrawContext::Create(_farMesh->GetPatchTables(), numVertexElements, bits.test(MeshFVarData));
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
_drawContext->UpdateVertexTexture(_vertexBuffer);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
FarMesh<OsdVertex> *_farMesh;
VertexBuffer *_vertexBuffer;
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
VertexBuffer *_varyingBuffer;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
ComputeContext *_computeContext;
ComputeController *_computeController;
DrawContext *_drawContext;
};
#ifdef OPENSUBDIV_HAS_OPENCL
template <class VERTEX_BUFFER>
class OsdMesh<VERTEX_BUFFER, OsdCLComputeController, OsdGLDrawContext> : public OsdGLMeshInterface {
public:
typedef VERTEX_BUFFER VertexBuffer;
typedef OsdCLComputeController ComputeController;
typedef typename ComputeController::ComputeContext ComputeContext;
typedef OsdGLDrawContext DrawContext;
typedef typename DrawContext::VertexBufferBinding VertexBufferBinding;
OsdMesh no longer owns its ComputeController Now a ComputeController is passed as an argument to OsdMesh::Create(). This is a better match to the underlying object model and can be much more efficient for compute controllers that have expensive resources, e.g. compiled shader kernels. Fixes #103
2013-02-20 01:33:32 +00:00
OsdMesh(ComputeController * computeController,
HbrMesh<OsdVertex> * hmesh,
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
int numVertexElements,
int numVaryingElements,
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
int level,
OsdMeshBitset bits,
cl_context clContext,
cl_command_queue clQueue) :
_farMesh(0),
_vertexBuffer(0),
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
_varyingBuffer(0),
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
_computeContext(0),
OsdMesh no longer owns its ComputeController Now a ComputeController is passed as an argument to OsdMesh::Create(). This is a better match to the underlying object model and can be much more efficient for compute controllers that have expensive resources, e.g. compiled shader kernels. Fixes #103
2013-02-20 01:33:32 +00:00
_computeController(computeController),
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
_drawContext(0),
_clContext(clContext),
_clQueue(clQueue)
{
FarMeshFactory<OsdVertex> meshFactory(hmesh, level, bits.test(MeshAdaptive));
fix OsdGLDrawContext to follow far patchtables refactoring.
2013-05-09 16:23:01 +00:00
_farMesh = meshFactory.Create(bits.test(MeshFVarData));
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_initialize(numVertexElements, numVaryingElements, bits);
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
}
OsdMesh(ComputeController * computeController,
FarMesh<OsdVertex> * fmesh,
int numVertexElements,
int numVaryingElements,
OsdMeshBitset bits,
cl_context clContext,
cl_command_queue clQueue) :
_farMesh(fmesh),
_vertexBuffer(0),
_varyingBuffer(0),
_computeContext(0),
_computeController(computeController),
_drawContext(0),
_clContext(clContext),
_clQueue(clQueue)
{
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_initialize(numVertexElements, numVaryingElements, bits);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Added a public constructor to OsdMesh that initializes the members objects from its arguments, allowing those members to be created by a subclass or an external function. * maintainance work on the D3D11 specialization of OsdMesh to bring it in line with the other template specializations * updated the facePartition example to derive PartitionedMesh from OsdMesh in order to allow other vertex buffer and compute controller configurations
2014-04-19 00:19:08 +00:00
OsdMesh(ComputeController * computeController,
FarMesh<OsdVertex> * fmesh,
VertexBuffer * vertexBuffer,
VertexBuffer * varyingBuffer,
ComputeContext * computeContext,
DrawContext * drawContext,
cl_context clContext,
cl_command_queue clQueue) :
_farMesh(fmesh),
_vertexBuffer(vertexBuffer),
_varyingBuffer(varyingBuffer),
_computeContext(computeContext),
_computeController(computeController),
_drawContext(drawContext),
_clContext(clContext),
_clQueue(clQueue)
{
_drawContext->UpdateVertexTexture(_vertexBuffer);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual ~OsdMesh() {
delete _farMesh;
delete _vertexBuffer;
Interleaved buffer support in OsdCompute. Removed OsdVertexDescriptor and replaced with OsdVertexBufferDescriptor. All kernels take offset/length/stride to apply subdivision partially in each vertex elements. Also the offset can be used for client-based VBO aggregation, without modifying index buffers. This is useful for topology sharing, in conjunction with glDrawElementsBaseVertex etc. However, gregory patch shader fetches vertex buffer via texture buffer, which index should also be offsetted too. Although gl_BaseVertexARB extension should be able to do that job, it's a relatively new extension. So we use OsdBaseVertex() call to mitigate the compatibility issue as clients can provide it in their way at least for the time being.
2014-05-09 00:20:54 +00:00
delete _varyingBuffer;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
delete _computeContext;
delete _drawContext;
}
virtual int GetNumVertices() const { return _farMesh->GetNumVertices(); }
Batching stuffs: generalized kernel batches, table/dispatcher refactoring, multiMeshFactory, drawContext, etc. 2 client APIs are changed. - VertexBuffer::UpdateData() takes start vertex offset - ComputeController::Refine() takes FarKernelBatchVector Also, ComputeContext no longer holds farmesh. Client can free farmesh after OsdComputeContext is created. (but still need FarKernelBatchVector to apply subdivision kernels)
2013-03-08 01:50:15 +00:00
virtual void UpdateVertexBuffer(float const *vertexData, int startVertex, int numVerts) {
_vertexBuffer->UpdateData(vertexData, startVertex, numVerts, _clQueue);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual void UpdateVaryingBuffer(float const *varyingData, int startVertex, int numVerts) {
_varyingBuffer->UpdateData(varyingData, startVertex, numVerts, _clQueue);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual void Refine() {
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(), _vertexBuffer, _varyingBuffer);
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
}
Interleaved buffer support in OsdCompute. Removed OsdVertexDescriptor and replaced with OsdVertexBufferDescriptor. All kernels take offset/length/stride to apply subdivision partially in each vertex elements. Also the offset can be used for client-based VBO aggregation, without modifying index buffers. This is useful for topology sharing, in conjunction with glDrawElementsBaseVertex etc. However, gregory patch shader fetches vertex buffer via texture buffer, which index should also be offsetted too. Although gl_BaseVertexARB extension should be able to do that job, it's a relatively new extension. So we use OsdBaseVertex() call to mitigate the compatibility issue as clients can provide it in their way at least for the time being.
2014-05-09 00:20:54 +00:00
virtual void Refine(OsdVertexBufferDescriptor const *vertexDesc,
OsdVertexBufferDescriptor const *varyingDesc,
bool interleaved) {
_computeController->Refine(_computeContext, _farMesh->GetKernelBatches(),
_vertexBuffer, (interleaved ? _vertexBuffer : _varyingBuffer),
vertexDesc, varyingDesc);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual void Synchronize() {
_computeController->Synchronize();
}
virtual VertexBufferBinding BindVertexBuffer() {
return _vertexBuffer->BindVBO();
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual VertexBufferBinding BindVaryingBuffer() {
return _varyingBuffer->BindVBO();
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
virtual DrawContext * GetDrawContext() {
return _drawContext;
}
OsdGlMesh : adding accessors for the FarMesh and the VertexBuffer for Scot
2013-06-19 19:55:12 +00:00
virtual VertexBuffer * GetVertexBuffer() {
return _vertexBuffer;
}
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
virtual VertexBuffer * GetVaryingBuffer() {
return _varyingBuffer;
}
OsdGlMesh : adding accessors for the FarMesh and the VertexBuffer for Scot
2013-06-19 19:55:12 +00:00
virtual FarMesh<OsdVertex> const * GetFarMesh() const {
return _farMesh;
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
private:
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
void _initialize( int numVertexElements,
int numVaryingElements,
OsdMeshBitset bits)
{
int numVertices = _farMesh->GetNumVertices();
if (numVertexElements)
_vertexBuffer = VertexBuffer::Create(numVertexElements, numVertices, _clContext);
if (numVaryingElements)
_varyingBuffer = VertexBuffer::Create(numVaryingElements, numVertices, _clContext);
Remove FarMesh dependency from Osd*Context. The context constructor takes subdivision tables and vertex edit tables directly.
2014-03-28 19:10:13 +00:00
_computeContext = ComputeContext::Create(_farMesh->GetSubdivisionTables(), _farMesh->GetVertexEditTables(), _clContext);
Draw contexts do not fully initialize patch arrays #281 * added the numVertexElements argument to Osd*DrawContext::Create, which is used to initialize the patch arrays when calling OsdDrawContext::ConvertPatchArrays * removed the unused level argument from Osd*DrawContext::_initialize * maintenance work on CL/D3D11 bindings to get them to compile
2014-04-17 23:47:48 +00:00
_drawContext = DrawContext::Create(_farMesh->GetPatchTables(), numVertexElements, bits.test(MeshFVarData));
Add OsdMesh constructor with FarMesh * as input This allows client code to own the FarMesFactory if necessary.
2013-08-08 20:11:16 +00:00
_drawContext->UpdateVertexTexture(_vertexBuffer);
}
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
FarMesh<OsdVertex> *_farMesh;
VertexBuffer *_vertexBuffer;
Add varying buffer handling to OsdMesh. Fix a bug that breaks varying interpolation on cuda kernel Clean up glViewer with some new functions : varying color, screen space lod, patch culling
2013-06-27 19:57:21 +00:00
VertexBuffer *_varyingBuffer;
Release Candidate 1.0 : - [Feature Adaptive GPU Rendering of Catmull-Clark Surfaces](http://research.microsoft.com/en-us/um/people/cloop/tog2012.pdf). - New API architecture : we are planning to lock on to this new framework as the basis for backward compatibility, which we will enforce from Release 1.0 onward. Subsequent releases of OpenSubdiv should not break client code. - DirectX 11 support - and much more...
2012-12-11 01:15:13 +00:00
ComputeContext *_computeContext;
ComputeController *_computeController;
DrawContext *_drawContext;
cl_context _clContext;
cl_command_queue _clQueue;
};
#endif
} // end namespace OPENSUBDIV_VERSION
using namespace OPENSUBDIV_VERSION;
} // end namespace OpenSubdiv
#endif // OSD_GL_MESH_H
Reference in New Issue Copy Permalink