AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-29 06:41:09 +00:00
Code Issues Releases Wiki Activity

Many more fix-ups to the osd_regression tests:

Browse Source 
- CPU, CPUGL backends both updated
 - CL backend still needs work
 - Loop subdivision tests disabled because they don't work
 - Hedit tests disbaled because they don't work
This commit is contained in:
George ElKoura 2015-03-29 01:27:20 -07:00
parent 38b079d4ea
commit e06debc4e8
1 changed files with 86 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

135
regression/osd_regression/main.cpp
View File

@ -260,6 +260,28 @@ checkVertexBuffer(
return count; return count;
} }
//------------------------------------------------------------------------------
static void
buildContexAndStencilTables(
const FarTopologyRefiner &refiner,
Osd::CpuComputeContext **cpuComputeContext,
Far::StencilTables const **vertexStencils,
Far::StencilTables const **varyingStencils)
{
Far::StencilTablesFactory::Options soptions;
soptions.generateOffsets = true;
soptions.generateIntermediateLevels = true;
*vertexStencils = Far::StencilTablesFactory::Create(refiner, soptions);
soptions.interpolationMode = Far::StencilTablesFactory::INTERPOLATE_VARYING;
*varyingStencils = Far::StencilTablesFactory::Create(refiner, soptions);
*cpuComputeContext = Osd::CpuComputeContext::Create(
*vertexStencils, *varyingStencils);
}
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static int static int
@ -270,20 +292,12 @@ checkMeshCPU( FarTopologyRefiner *refiner,
static Osd::CpuComputeController *controller = static Osd::CpuComputeController *controller =
new Osd::CpuComputeController(); new Osd::CpuComputeController();
Far::StencilTablesFactory::Options soptions;
soptions.generateOffsets = true;
soptions.generateIntermediateLevels = true;
Far::StencilTables const * vertexStencils = Osd::CpuComputeContext *context;
Far::StencilTablesFactory::Create(*refiner, soptions); Far::StencilTables const *vertexStencils;
Far::StencilTables const *varyingStencils;
soptions.interpolationMode = Far::StencilTablesFactory::INTERPOLATE_VARYING; buildContexAndStencilTables(*refiner,
Far::StencilTables const * varyingStencils = &context, &vertexStencils, &varyingStencils);
Far::StencilTablesFactory::Create(*refiner, soptions);
Osd::CpuComputeContext *context =
Osd::CpuComputeContext::Create(
vertexStencils, varyingStencils);
assert(coarseverts.size() == refiner->GetNumVerticesTotal()); assert(coarseverts.size() == refiner->GetNumVerticesTotal());
@ -298,41 +312,63 @@ checkMeshCPU( FarTopologyRefiner *refiner,
Far::StencilTablesFactory::Create(*vertexStencils)); Far::StencilTablesFactory::Create(*vertexStencils));
controller->Compute( context, kernelBatches, vb ); controller->Compute( context, kernelBatches, vb );
return checkVertexBuffer(*refiner, refmesh, vb->BindCpuBuffer(), int result = checkVertexBuffer(*refiner, refmesh, vb->BindCpuBuffer(),
vb->GetNumElements()); vb->GetNumElements());
delete context;
delete vertexStencils;
delete varyingStencils;
delete vb;
return result;
} }
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if 0
static int static int
checkMeshCPUGL( OpenSubdiv::FarMesh<OpenSubdiv::OsdVertex>* farmesh, checkMeshCPUGL(FarTopologyRefiner *refiner,
const std::vector<float>& coarseverts, const std::vector<xyzVV>& coarseverts,
xyzmesh * refmesh, xyzmesh * refmesh) {
const std::vector<int>& remap) {
static Osd::CpuComputeController *controller =
static OpenSubdiv::OsdCpuComputeController *controller = new OpenSubdiv::OsdCpuComputeController(); new Osd::CpuComputeController();
OpenSubdiv::OsdCpuComputeContext *context = OpenSubdiv::OsdCpuComputeContext::Create(farmesh->GetSubdivisionTables(), farmesh->GetVertexEditTables()); Osd::CpuComputeContext *context;
Far::StencilTables const *vertexStencils;
Far::StencilTables const *varyingStencils;
buildContexAndStencilTables(*refiner,
&context, &vertexStencils, &varyingStencils);
OpenSubdiv::OsdCpuGLVertexBuffer * vb = OpenSubdiv::OsdCpuGLVertexBuffer::Create(3, farmesh->GetNumVertices()); Osd::CpuGLVertexBuffer *vb = Osd::CpuGLVertexBuffer::Create(3,
refiner->GetNumVerticesTotal());
vb->UpdateData( & coarseverts[0], 0, (int)coarseverts.size()/3 ); vb->UpdateData( coarseverts[0].GetPos(), 0, (int)coarseverts.size() );
Far::KernelBatchVector kernelBatches;
kernelBatches.push_back(
Far::StencilTablesFactory::Create(*vertexStencils));
controller->Refine( context, farmesh->GetKernelBatches(), vb ); controller->Compute( context, kernelBatches, vb );
return checkVertexBuffer(refmesh, vb->BindCpuBuffer(), vb->GetNumElements(), remap); int result = checkVertexBuffer(*refiner, refmesh,
vb->BindCpuBuffer(), vb->GetNumElements());
delete context;
delete vertexStencils;
delete varyingStencils;
delete vb;
return result;
} }
#endif
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
#if 0
static int static int
checkMeshCL( OpenSubdiv::FarMesh<OpenSubdiv::OsdVertex>* farmesh, checkMeshCL( FarTopologyRefiner *refiner,
const std::vector<float>& coarseverts, const std::vector<xyzVV>& coarseverts,
xyzmesh * refmesh, xyzmesh * refmesh) {
const std::vector<int>& remap ) {
#ifdef OPENSUBDIV_HAS_OPENCL #ifdef OPENSUBDIV_HAS_OPENCL
static OpenSubdiv::OsdCLComputeController *controller = new OpenSubdiv::OsdCLComputeController(g_clContext, g_clQueue); static OpenSubdiv::OsdCLComputeController *controller = new OpenSubdiv::OsdCLComputeController(g_clContext, g_clQueue);
@ -360,7 +396,6 @@ checkMeshCL( OpenSubdiv::FarMesh<OpenSubdiv::OsdVertex>* farmesh,
return 0; return 0;
#endif #endif
} }
#endif
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
static int static int
@ -383,14 +418,12 @@ checkMesh( char const * msg, std::string const & shape, int levels, Scheme schem
case kBackendCPU: case kBackendCPU:
result = checkMeshCPU(refiner, vtrVertexData, refmesh); result = checkMeshCPU(refiner, vtrVertexData, refmesh);
break; break;
/*
case kBackendCPUGL: case kBackendCPUGL:
result = checkMeshCPUGL(farmesh, coarseverts, refmesh, remap); result = checkMeshCPUGL(refiner, vtrVertexData, refmesh);
break; break;
case kBackendCL: case kBackendCL:
result = checkMeshCL(farmesh, coarseverts, refmesh, remap); result = checkMeshCL(refiner, vtrVertexData, refmesh);
break; break;
*/
} }
delete refmesh; delete refmesh;
@ -437,17 +470,21 @@ int checkBackend(int backend, int levels) {
#define test_catmark_tent #define test_catmark_tent
#define test_catmark_tent_creases0 #define test_catmark_tent_creases0
#define test_catmark_tent_creases1 #define test_catmark_tent_creases1
#define test_catmark_square_hedit0
#define test_catmark_square_hedit1
#define test_catmark_square_hedit2
#define test_catmark_square_hedit3
#define test_loop_triangle_edgeonly
#define test_loop_triangle_edgecorner // Hedits don't yet work.
#define test_loop_icosahedron //#define test_catmark_square_hedit0
#define test_loop_cube //#define test_catmark_square_hedit1
#define test_loop_cube_creases0 //#define test_catmark_square_hedit2
#define test_loop_cube_creases1 //#define test_catmark_square_hedit3
// Loop doesn't yet work.
//#define test_loop_triangle_edgeonly
//#define test_loop_triangle_edgecorner
//#define test_loop_icosahedron
//#define test_loop_cube
//#define test_loop_cube_creases0
//#define test_loop_cube_creases1
#define test_bilinear_cube #define test_bilinear_cube