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

Merge pull request #706 from barfowl/icc_pragmas

Browse Source 
Eliminate or encapsulate  recently added ICC pragmas
This commit is contained in:
George ElKoura 2015-07-20 23:25:26 -07:00
commit fa3a6fc43b
6 changed files with 86 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
opensubdiv/far/endCapBSplineBasisPatchFactory.cpp
View File

@ -37,6 +37,17 @@ namespace OPENSUBDIV_VERSION {
namespace Far {
namespace {
#ifdef __INTEL_COMPILER
#pragma warning (push)
#pragma warning disable 1572
#endif
inline bool isWeightNonZero(float w) { return (w != 0.0f); }
#ifdef __INTEL_COMPILER
#pragma warning (pop)
#endif
}
EndCapBSplineBasisPatchFactory::EndCapBSplineBasisPatchFactory(
TopologyRefiner const & refiner) :
_refiner(&refiner), _numVertices(0), _numPatches(0) {
@ -86,9 +97,6 @@ EndCapBSplineBasisPatchFactory::GetPatchPoints(
bezierCP.push_back(basis.Ep[2]);
bezierCP.push_back(basis.P[2]);
#pragma warning (push)
#pragma warning disable 1572 //floating-point equality and inequality comparisons are unreliable
// Apply basis conversion from bezier to b-spline
float Q[4][4] = {{ 6, -7, 2, 0},
{ 0, 2, -1, 0},
@ -98,7 +106,7 @@ EndCapBSplineBasisPatchFactory::GetPatchPoints(
for (int i = 0; i < 4; ++i) {
for (int j = 0; j < 4; ++j) {
for (int k = 0; k < 4; ++k) {
if (Q[i][k] != 0.0f) H[i*4+j] += bezierCP[j+k*4] * Q[i][k];
if (isWeightNonZero(Q[i][k])) H[i*4+j] += bezierCP[j+k*4] * Q[i][k];
}
}
}
@ -106,12 +114,11 @@ EndCapBSplineBasisPatchFactory::GetPatchPoints(
for (int j = 0; j < 4; ++j) {
GregoryBasis::Point p;
for (int k = 0; k < 4; ++k) {
if (Q[j][k] != 0.0f) p += H[i*4+k] * Q[j][k];
if (isWeightNonZero(Q[j][k])) p += H[i*4+k] * Q[j][k];
}
_vertexStencils.push_back(p);
}
}
#pragma warning (pop)
int varyingIndices[] = { 0, 0, 1, 1,
0, 0, 1, 1,

50
opensubdiv/far/patchTableFactory.cpp
View File

@ -41,15 +41,14 @@ namespace OPENSUBDIV_VERSION {
namespace {
#pragma warning disable 177 //function getNumPatchArrays was declared but never referenced
//
// A convenience container for the different types of feature adaptive patches
// A convenience container for the different types of feature adaptive patches.
// Each instance associates a value of the template parameter type with each
// patch type.
//
template <class TYPE>
struct PatchTypes {
TYPE R, // regular patch
G, // gregory patch
GB, // gregory boundary patch
@ -57,7 +56,6 @@ struct PatchTypes {
PatchTypes() { std::memset(this, 0, sizeof(PatchTypes<TYPE>)); }
// Returns the number of patches based on the patch type in the descriptor
TYPE & getValue( Far::PatchDescriptor desc ) {
switch (desc.GetType()) {
case Far::PatchDescriptor::REGULAR : return R;
@ -69,17 +67,6 @@ struct PatchTypes {
// can't be reached (suppress compiler warning)
return R;
}
// Counts the number of arrays required to store each type of patch used
// in the primitive
int getNumPatchArrays() const {
int result=0;
if (R) ++result;
if (G) ++result;
if (GB) ++result;
if (GP) ++result;
return result;
}
};
typedef PatchTypes<Far::Index *> PatchCVPointers;
@ -88,6 +75,17 @@ typedef PatchTypes<Far::Index *> SharpnessIndexPointers;
typedef PatchTypes<Far::Index> PatchFVarOffsets;
typedef PatchTypes<Far::Index **> PatchFVarPointers;
// Helpers for compiler warnings and floating point equality tests
#ifdef __INTEL_COMPILER
#pragma warning (push)
#pragma warning disable 1572
#endif
inline bool isSharpnessEqual(float s1, float s2) { return (s1 == s2); }
#ifdef __INTEL_COMPILER
#pragma warning (pop)
#endif
} // namespace anon
@ -254,8 +252,8 @@ public:
}
// Compare cursor positions
bool operator != (int pos) {
return _currentChannel < pos;
bool operator != (int posArg) {
return _currentChannel < posArg;
}
// Return FVar channel index in the TopologyRefiner list
@ -513,16 +511,12 @@ PatchTableFactory::computePatchParam(
inline int
assignSharpnessIndex(float sharpness, std::vector<float> & sharpnessValues) {
#pragma warning (push)
#pragma warning disable 1572 // floating-point equality and inequality comparisons are unreliable
// linear search
for (int i=0; i<(int)sharpnessValues.size(); ++i) {
if (sharpnessValues[i] == sharpness) {
if (isSharpnessEqual(sharpnessValues[i], sharpness)) {
return i;
}
}
#pragma warning (pop)
sharpnessValues.push_back(sharpness);
return (int)sharpnessValues.size()-1;
}
@ -722,7 +716,13 @@ PatchTableFactory::createAdaptive(TopologyRefiner const & refiner, Options optio
context.table = new PatchTable(maxValence);
// Populate the patch array descriptors
context.table->reservePatchArrays(context.patchInventory.getNumPatchArrays());
int numPatchArrays = 0;
if (context.patchInventory.R > 0) ++numPatchArrays;
if (context.patchInventory.G > 0) ++numPatchArrays;
if (context.patchInventory.GB > 0) ++numPatchArrays;
if (context.patchInventory.GP > 0) ++numPatchArrays;
context.table->reservePatchArrays(numPatchArrays);
// Sort through the inventory and push back non-empty patch arrays
ConstPatchDescriptorArray const & descs =
@ -1170,7 +1170,7 @@ PatchTableFactory::populateAdaptivePatches(
permutation = permuteCorner[bIndex];
level->gatherQuadRegularCornerPatchPoints(faceIndex, patchVerts, bIndex);
} else {
assert(patchTag._boundaryCount >0 && patchTag._boundaryCount <= 2);
assert(patchTag._boundaryCount <= 2);
}
offsetAndPermuteIndices(patchVerts, 16, levelVertOffset, permutation, iptrs.R);

29
opensubdiv/far/stencilBuilder.cpp
View File

@ -31,6 +31,19 @@ namespace OPENSUBDIV_VERSION {
namespace Far {
namespace internal {
namespace {
#ifdef __INTEL_COMPILER
#pragma warning (push)
#pragma warning disable 1572
#endif
inline bool isWeightZero(float w) { return (w == 0.0f); }
#ifdef __INTEL_COMPILER
#pragma warning (pop)
#endif
}
struct PointDerivWeight {
float p;
float du;
@ -363,15 +376,13 @@ StencilBuilder::GetStencilDvWeights() const {
return _weightTable->GetDvWeights();
}
#pragma warning (push)
#pragma warning disable 1572 //floating-point equality and inequality comparisons are unreliable
void
StencilBuilder::Index::AddWithWeight(Index const & src, float weight)
{
// Ignore no-op weights.
if (weight == 0.0f)
if (isWeightZero(weight)) {
return;
}
_owner->_weightTable->AddWithWeight(src._index, _index, weight,
_owner->_weightTable->GetScalarAccumulator());
}
@ -379,7 +390,7 @@ StencilBuilder::Index::AddWithWeight(Index const & src, float weight)
void
StencilBuilder::Index::AddWithWeight(Stencil const& src, float weight)
{
if(weight == 0.0f) {
if (isWeightZero(weight)) {
return;
}
@ -389,7 +400,7 @@ StencilBuilder::Index::AddWithWeight(Stencil const& src, float weight)
for (int i = 0; i < srcSize; ++i) {
float w = srcWeights[i];
if (w == 0.0f) {
if (isWeightZero(w)) {
continue;
}
@ -405,7 +416,7 @@ void
StencilBuilder::Index::AddWithWeight(Stencil const& src,
float weight, float du, float dv)
{
if(weight == 0.0f and du == 0.0f and dv == 0.0f) {
if (isWeightZero(weight) and isWeightZero(du) and isWeightZero(dv)) {
return;
}
@ -415,7 +426,7 @@ StencilBuilder::Index::AddWithWeight(Stencil const& src,
for (int i = 0; i < srcSize; ++i) {
float w = srcWeights[i];
if (w == 0.0f) {
if (isWeightZero(w)) {
continue;
}
@ -427,8 +438,6 @@ StencilBuilder::Index::AddWithWeight(Stencil const& src,
}
}
#pragma warning (pop)
} // end namespace internal
} // end namespace Far
} // end namespace OPENSUBDIV_VERSION

18
opensubdiv/far/stencilTableFactory.cpp
View File

@ -40,6 +40,19 @@ namespace OPENSUBDIV_VERSION {
namespace Far {
namespace {
#ifdef __INTEL_COMPILER
#pragma warning (push)
#pragma warning disable 1572
#endif
inline bool isWeightZero(float w) { return (w == 0.0f); }
#ifdef __INTEL_COMPILER
#pragma warning (pop)
#endif
}
//------------------------------------------------------------------------------
void
@ -258,10 +271,7 @@ StencilTableFactory::AppendLocalPointStencilTable(
for (int j = 0; j < src.GetSize(); ++j) {
Index index = src.GetVertexIndices()[j];
float weight = src.GetWeights()[j];
#pragma warning (push)
#pragma warning disable 1572 //floating-point equality and inequality comparisons are unreliable
if (weight == 0.0f) continue;
#pragma warning (pop)
if (isWeightZero(weight)) continue;
if (factorize) {
dst.AddWithWeight(

6
opensubdiv/vtr/array.h
View File

@ -66,8 +66,8 @@ public:
ConstArray() : _begin(0), _size(0) { }
ConstArray(value_type const * ptr, size_type size) :
_begin(ptr), _size(size) { }
ConstArray(value_type const * ptr, size_type sizeArg) :
_begin(ptr), _size(sizeArg) { }
size_type size() const { return _size; }
@ -117,7 +117,7 @@ public:
Array() : ConstArray<TYPE>() { }
Array(value_type * ptr, size_type size) : ConstArray<TYPE>(ptr, size) { }
Array(value_type * ptr, size_type sizeArg) : ConstArray<TYPE>(ptr, sizeArg) { }
public:

18
opensubdiv/vtr/level.cpp
View File

@ -35,7 +35,7 @@
#include <algorithm>
#include <vector>
#include <map>
#ifdef _MSC_VER
#define snprintf _snprintf
#endif
@ -380,6 +380,15 @@ namespace {
}
return 0;
}
#ifdef __INTEL_COMPILER
#pragma warning (push)
#pragma warning disable 1572
#endif
inline bool isSharpnessEqual(float s1, float s2) { return (s1 == s2); }
#ifdef __INTEL_COMPILER
#pragma warning (pop)
#endif
}
void
@ -1296,13 +1305,10 @@ Level::isSingleCreasePatch(Index face, float *sharpnessOut, int *rotationOut) co
}
}
// sharpnesses have to be [0, x, 0, x] or [x, 0, x, 0]
#pragma warning (push)
#pragma warning disable 1572 //floating-point equality and inequality comparisons are unreliable
if (sharpnesses[0] != sharpnesses[2] or
sharpnesses[1] != sharpnesses[3]) {
if (isSharpnessEqual(sharpnesses[0], sharpnesses[2]) or
isSharpnessEqual(sharpnesses[1], sharpnesses[3])) {
return false;
}
#pragma warning (pop)
}
// check the edges around v[2], v[3]
for (int i = 2; i < 4; ++i) {