AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-23 12:10:08 +00:00
Code Issues Releases Wiki Activity

Fix Windows build

Browse Source
This commit is contained in:
manuelk 2014-11-25 14:14:59 -08:00
parent b27b55e4a8
commit 538c13f394
4 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/dxPtexViewer/dxPtexViewer.cpp
View File

@ -467,8 +467,8 @@ EffectDrawRegistry::_CreateDrawSourceConfig(DescType const & desc, ID3D11Device
sconfig->commonShader.AddDefine("OSD_FRACTIONAL_ODD_SPACING");
bool quad = true;
if (desc.first.GetType() == OpenSubdiv::Far::PatchTables::QUADS ||
desc.first.GetType() == OpenSubdiv::Far::PatchTables::TRIANGLES) {
if (desc.first.GetType() == OpenSubdiv::Far::PatchDescriptor::QUADS ||
desc.first.GetType() == OpenSubdiv::Far::PatchDescriptor::TRIANGLES) {
sconfig->vertexShader.source = g_shaderSource;
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main";

6
examples/dxViewer/dxviewer.cpp
View File

@ -489,12 +489,12 @@ EffectDrawRegistry::_CreateDrawSourceConfig(
sconfig->commonShader.AddDefine("OSD_ENABLE_SCREENSPACE_TESSELLATION");
bool smoothNormals = false;
if (desc.first.GetType() == OpenSubdiv::Far::PatchTables::QUADS ||
desc.first.GetType() == OpenSubdiv::Far::PatchTables::TRIANGLES) {
if (desc.first.GetType() == OpenSubdiv::Far::PatchDescriptor::QUADS ||
desc.first.GetType() == OpenSubdiv::Far::PatchDescriptor::TRIANGLES) {
sconfig->vertexShader.source = shaderSource;
sconfig->vertexShader.target = "vs_5_0";
sconfig->vertexShader.entry = "vs_main";
} else if (desc.first.GetType() == OpenSubdiv::Far::PatchTables::TRIANGLES) {
} else if (desc.first.GetType() == OpenSubdiv::Far::PatchDescriptor::TRIANGLES) {
if (effect.displayStyle == kQuadWire) effect.displayStyle = kTriWire;
if (effect.displayStyle == kQuadFill) effect.displayStyle = kTriFill;
if (effect.displayStyle == kQuadLine) effect.displayStyle = kTriLine;

3
opensubdiv/osd/d3d11DrawContext.cpp
View File

@ -86,7 +86,8 @@ D3D11DrawContext::create(Far::PatchTables const &patchTables,
pd3d11DeviceContext->GetDevice(&pd3d11Device);
assert(pd3d11Device);
ConvertPatchArrays(patchTables.GetPatchArrayVector(), _patchArrays, patchTables.GetMaxValence(), numVertexElements);
DrawContext::ConvertPatchArrays(patchTables, _patchArrays,
patchTables.GetMaxValence(), numVertexElements);
Far::PatchTables::PatchVertsTable const & ptables = patchTables.GetPatchControlVerticesTable();
Far::PatchParamTable const & ptexCoordTables = patchTables.GetPatchParamTable();

5
opensubdiv/vtr/fvarRefinement.cpp
View File

@ -435,10 +435,11 @@ FVarRefinement::propagateValueTags() {
Index pVert = _refinement.getChildVertexParentIndex(cVert);
assert(!_refinement._childVertexTag[cVert]._incomplete);
FVarLevel::ValueTagArray pValueTags = _parentFVar.getVertexValueTags(pVert);
FVarLevel::ValueTagArray const pValueTags = _parentFVar.getVertexValueTags(pVert);
FVarLevel::ValueTagArray cValueTags = _childFVar.getVertexValueTags(cVert);
std::copy(pValueTags.begin(), pValueTags.end(), cValueTags.begin());
memcpy(cValueTags.begin(), pValueTags.begin(),
pValueTags.size()*sizeof(FVarLevel::ValueTag));
}
}