AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-12-03 08:21:03 +00:00
Code Issues Releases Wiki Activity
1d8cb62255
OpenSubdiv/opensubdiv/osd/ompComputeController.cpp

294 lines
11 KiB
C++
Raw Normal View History

From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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:
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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.
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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.
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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
#include "../osd/cpuComputeContext.h"
#include "../osd/ompComputeController.h"
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
#include "../osd/ompKernel.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_OPENMP
#include <omp.h>
#endif
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +00:00
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
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
OsdOmpComputeController::OsdOmpComputeController(int numThreads) {
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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
_numThreads = (numThreads == -1) ? omp_get_num_procs() : numThreads;
}
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +00:00
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
void
OsdOmpComputeController::ApplyBilinearFaceVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeFace(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::F_IT)->GetBuffer(),
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::F_ITa)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyBilinearEdgeVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeBilinearEdge(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::E_IT)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyBilinearVertexVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeBilinearVertex(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyCatmarkFaceVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeFace(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::F_IT)->GetBuffer(),
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::F_ITa)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyCatmarkEdgeVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeEdge(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::E_IT)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::E_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyCatmarkVertexVerticesKernelB(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeVertexB(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_IT)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyCatmarkVertexVerticesKernelA1(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeVertexA(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd(), false);
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
}
void
OsdOmpComputeController::ApplyCatmarkVertexVerticesKernelA2(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeVertexA(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd(), true);
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
}
void
OsdOmpComputeController::ApplyLoopEdgeVerticesKernel(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeEdge(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::E_IT)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::E_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyLoopVertexVerticesKernelB(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeLoopVertexB(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_IT)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd());
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
}
void
OsdOmpComputeController::ApplyLoopVertexVerticesKernelA1(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeVertexA(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd(), false);
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
}
void
OsdOmpComputeController::ApplyLoopVertexVerticesKernelA2(
FarKernelBatch const &batch, void *clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
OsdOmpComputeVertexA(
context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
Refactoring : - moving the SubdivisionTables enum from osd/tables.h to FarSubdivisionTables - renaming various buffer names to _devicePtr for consistency
2013-05-07 22:25:49 +00:00
(const int*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_ITa)->GetBuffer(),
(const float*)context->GetTable(FarSubdivisionTables<OsdVertex>::V_W)->GetBuffer(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(), batch.GetTableOffset(), batch.GetStart(), batch.GetEnd(), true);
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
}
void
OsdOmpComputeController::ApplyVertexEdits(
FarKernelBatch const &batch, void * clientdata) const {
OsdCpuComputeContext * context =
static_cast<OsdCpuComputeContext*>(clientdata);
assert(context);
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
const OsdCpuHEditTable *edit = context->GetEditTable(batch.GetTableIndex());
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
assert(edit);
const OsdCpuTable * primvarIndices = edit->GetPrimvarIndices();
const OsdCpuTable * editValues = edit->GetEditValues();
if (edit->GetOperation() == FarVertexEdit::Add) {
OsdOmpEditVertexAdd(context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
edit->GetPrimvarOffset(),
edit->GetPrimvarWidth(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(),
batch.GetTableOffset(),
batch.GetStart(),
batch.GetEnd(),
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
static_cast<unsigned int*>(primvarIndices->GetBuffer()),
static_cast<float*>(editValues->GetBuffer()));
} else if (edit->GetOperation() == FarVertexEdit::Set) {
OsdOmpEditVertexSet(context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
edit->GetPrimvarOffset(),
edit->GetPrimvarWidth(),
KernelBatch tables refactor / cleanup : - FarKernelBatch becomes a class w/ accessors - split the FarKernelBatchFactory to its own header file - add doxy doc - propagate fallout to the rest of the code base
2013-05-07 00:50:58 +00:00
batch.GetVertexOffset(),
batch.GetTableOffset(),
batch.GetStart(),
batch.GetEnd(),
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
static_cast<unsigned int*>(primvarIndices->GetBuffer()),
static_cast<float*>(editValues->GetBuffer()));
}
}
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
void
OsdOmpComputeController::Synchronize() {
// XXX:
}
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +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
} // end namespace OPENSUBDIV_VERSION
} // end namespace OpenSubdiv
From now on, hbr assumes that its clients will provide the defition of a mutex class with Lock / Unlock public functions. - remove Mutex implementation from Hbr (and revert to original PRman code) - provide a Mutex class stub in osd - add some forward declarations in OsdMesh to limit some of the mutex spills - #include <osd/mutex.h> where needed (little hackish until we can refactor some of far better) - remove ILM_BASE from some CMakeLists Closes #48
2012-08-10 22:14:02 +00:00
Reference in New Issue Copy Permalink