AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2025-01-11 09:00:08 +00:00
Code Issues Releases Wiki Activity

fix compile errors on gcd kernel

Browse Source
This commit is contained in:
Takahito Tejima 2013-03-07 22:43:47 -08:00
parent 8efecb0fca
commit fbc139d39c
5 changed files with 48 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
opensubdiv/osd/gcdComputeController.cpp
View File

@ -58,13 +58,14 @@
#include "../osd/cpuComputeContext.h"
#include "../osd/gcdComputeController.h"
#include "../osd/gcdKernel.h"
#Include "../osd/table.h"
#include "../osd/table.h"
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
OsdGcdComputeController::OsdGcdComputeController() {
_gcd_queue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
}
void
@ -81,7 +82,8 @@ OsdGcdComputeController::ApplyBilinearFaceVerticesKernel(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::F_IT)->GetBuffer(),
(const int*)context->GetTable(Table::F_ITa)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -97,7 +99,8 @@ OsdGcdComputeController::ApplyBilinearEdgeVerticesKernel(
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::E_IT)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -113,7 +116,8 @@ OsdGcdComputeController::ApplyBilinearVertexVerticesKernel(
context->GetCurrentVertexBuffer(),
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -130,7 +134,8 @@ OsdGcdComputeController::ApplyCatmarkFaceVerticesKernel(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::F_IT)->GetBuffer(),
(const int*)context->GetTable(Table::F_ITa)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -147,7 +152,8 @@ OsdGcdComputeController::ApplyCatmarkEdgeVerticesKernel(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::E_IT)->GetBuffer(),
(const float*)context->GetTable(Table::E_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -165,7 +171,8 @@ OsdGcdComputeController::ApplyCatmarkVertexVerticesKernelB(
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const int*)context->GetTable(Table::V_IT)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -182,7 +189,8 @@ OsdGcdComputeController::ApplyCatmarkVertexVerticesKernelA1(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, false);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, false,
_gcd_queue);
}
void
@ -199,7 +207,8 @@ OsdGcdComputeController::ApplyCatmarkVertexVerticesKernelA2(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, true);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, true,
_gcd_queue);
}
void
@ -216,7 +225,8 @@ OsdGcdComputeController::ApplyLoopEdgeVerticesKernel(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::E_IT)->GetBuffer(),
(const float*)context->GetTable(Table::E_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -234,7 +244,8 @@ OsdGcdComputeController::ApplyLoopVertexVerticesKernelB(
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const int*)context->GetTable(Table::V_IT)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end,
_gcd_queue);
}
void
@ -251,7 +262,8 @@ OsdGcdComputeController::ApplyLoopVertexVerticesKernelA1(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, false);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, false,
_gcd_queue);
}
void
@ -268,7 +280,8 @@ OsdGcdComputeController::ApplyLoopVertexVerticesKernelA2(
context->GetCurrentVaryingBuffer(),
(const int*)context->GetTable(Table::V_ITa)->GetBuffer(),
(const float*)context->GetTable(Table::V_W)->GetBuffer(),
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, true);
batch.vertexOffset, batch.tableOffset, batch.start, batch.end, true,
_gcd_queue);
}
void
@ -286,7 +299,7 @@ OsdGcdComputeController::ApplyVertexEdits(
const OsdCpuTable * editValues = edit->GetEditValues();
if (edit->GetOperation() == FarVertexEdit::Add) {
OsdCpuEditVertexAdd(context->GetVertexDescriptor(),
OsdGcdEditVertexAdd(context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
edit->GetPrimvarOffset(),
edit->GetPrimvarWidth(),
@ -295,9 +308,10 @@ OsdGcdComputeController::ApplyVertexEdits(
batch.start,
batch.end,
static_cast<unsigned int*>(primvarIndices->GetBuffer()),
static_cast<float*>(editValues->GetBuffer()));
static_cast<float*>(editValues->GetBuffer()),
_gcd_queue);
} else if (edit->GetOperation() == FarVertexEdit::Set) {
OsdCpuEditVertexSet(context->GetVertexDescriptor(),
OsdGcdEditVertexSet(context->GetVertexDescriptor(),
context->GetCurrentVertexBuffer(),
edit->GetPrimvarOffset(),
edit->GetPrimvarWidth(),
@ -306,7 +320,8 @@ OsdGcdComputeController::ApplyVertexEdits(
batch.start,
batch.end,
static_cast<unsigned int*>(primvarIndices->GetBuffer()),
static_cast<float*>(editValues->GetBuffer()));
static_cast<float*>(editValues->GetBuffer()),
_gcd_queue);
}
}

5
opensubdiv/osd/gcdComputeController.h
View File

@ -62,6 +62,8 @@
#include "../far/dispatcher.h"
#include "../osd/cpuComputeContext.h"
#include <dispatch/dispatch.h>
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
@ -135,6 +137,9 @@ protected:
void ApplyVertexEdits(FarKernelBatch const &batch, void * clientdata) const;
private:
dispatch_queue_t _gcd_queue;
};
} // end namespace OPENSUBDIV_VERSION

14
opensubdiv/osd/gcdKernel.cpp
View File

@ -84,7 +84,7 @@ void OsdGcdComputeFace(
const int end_e = end;
if (start_e < end_e)
OsdCpuComputeFace(vdesc, vertex, varying, F_IT, F_ITa,
vertexOffset, tableOffset, start_i, end_i);
vertexOffset, tableOffset, start_e, end_e);
}
void OsdGcdComputeEdge(
@ -104,7 +104,7 @@ void OsdGcdComputeEdge(
const int end_e = end;
if (start_e < end_e)
OsdCpuComputeEdge(vdesc, vertex, varying, E_IT, E_W,
vertexOffset, tableOffset, start_i, end_i);
vertexOffset, tableOffset, start_e, end_e);
}
void OsdGcdComputeVertexA(
@ -222,11 +222,12 @@ void OsdGcdEditVertexAdd(
int primVarOffset, int primVarWidth,
int vertexOffset, int tableOffset,
int start, int end,
const int *editIndices, const float *editValues,
const unsigned int *editIndices, const float *editValues,
dispatch_queue_t gcdq) {
int vertexCount = end - start;
dispatch_apply(vertexCount, gcdq, ^(size_t blockIdx){
int i = blockIdx + tableOffset;
int i = start + blockIdx + tableOffset;
vdesc->ApplyVertexEditAdd(vertex, primVarOffset, primVarWidth,
editIndices[i] + vertexOffset,
&editValues[i*primVarWidth]);
@ -238,11 +239,12 @@ void OsdGcdEditVertexSet(
int primVarOffset, int primVarWidth,
int vertexOffset, int tableOffset,
int start, int end,
const int *editIndices, const float *editValues,
const unsigned int *editIndices, const float *editValues,
dispatch_queue_t gcdq) {
int vertexCount = end - start;
dispatch_apply(vertexCount, gcdq, ^(size_t blockIdx){
int i = blockIdx + tableOffset;
int i = start + blockIdx + tableOffset;
vdesc->ApplyVertexEditSet(vertex, primVarOffset, primVarWidth,
editIndices[i] + vertexOffset,
&editValues[i*primVarWidth]);

4
opensubdiv/osd/gcdKernel.h
View File

@ -119,14 +119,14 @@ void OsdGcdEditVertexAdd(const OsdVertexDescriptor *vdesc, float *vertex,
int primVarOffset, int primVarWidth,
int vertexOffset, int tableOffset,
int start, int end,
const int *editIndices, const float *editValues,
const unsigned int *editIndices, const float *editValues,
dispatch_queue_t gcdq);
void OsdGcdEditVertexSet(const OsdVertexDescriptor *vdesc, float *vertex,
int primVarOffset, int primVarWidth,
int vertexOffset, int tableOffset,
int start, int end,
const int *editIndices, const float *editValues,
const unsigned int *editIndices, const float *editValues,
dispatch_queue_t gcdq);
} // end namespace OPENSUBDIV_VERSION

2
regression/osd_regression/main.cpp
View File

@ -370,7 +370,7 @@ checkMeshCPUGL( OpenSubdiv::FarMesh<OpenSubdiv::OsdVertex>* farmesh,
OpenSubdiv::OsdCpuGLVertexBuffer * vb = OpenSubdiv::OsdCpuGLVertexBuffer::Create(3, farmesh->GetNumVertices());
vb->UpdateData( & coarseverts[0], (int)coarseverts.size()/3 );
vb->UpdateData( & coarseverts[0], 0, (int)coarseverts.size()/3 );
controller->Refine( context, farmesh->GetKernelBatches(), vb );