Skip to content

Commit

Permalink
fixed alignment problem with parameter passing under windows
Browse files Browse the repository at this point in the history
  • Loading branch information
svenwoop committed Jan 18, 2013
1 parent 0492899 commit c6426e6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions rtcore/common/heuristic_binning.h
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ namespace embree
__forceinline PrimInfo ()
: num(0), geomBounds(empty), centBounds(empty) {}

__forceinline PrimInfo (size_t num, BBox3f geomBounds)
__forceinline PrimInfo (size_t num, const BBox3f& geomBounds)
: num(num), geomBounds(geomBounds), centBounds(geomBounds) {}

__forceinline PrimInfo (size_t num, BBox3f geomBounds, BBox3f centBounds)
__forceinline PrimInfo (size_t num, const BBox3f& geomBounds, const BBox3f& centBounds)
: num(num), geomBounds(geomBounds), centBounds(centBounds) {}

/*! returns the number of primitives */
Expand Down
6 changes: 3 additions & 3 deletions rtcore/common/heuristic_spatial.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,19 +62,19 @@ namespace embree
__forceinline PrimInfo ()
: num(0), numFailed(0), geomBounds(empty), centBounds(empty), duplications(NULL) {}

__forceinline PrimInfo (size_t num, BBox3f geomBounds)
__forceinline PrimInfo (size_t num, const BBox3f& geomBounds)
: num(num), numFailed(0), geomBounds(geomBounds), centBounds(geomBounds)
{
duplications = new Atomic(size_t(duplicationPercentage*double(num)/100.0));
}

__forceinline PrimInfo (size_t num, BBox3f geomBounds, BBox3f centBounds)
__forceinline PrimInfo (size_t num, const BBox3f& geomBounds, const BBox3f& centBounds)
: num(num), numFailed(0), geomBounds(geomBounds), centBounds(centBounds)
{
duplications = new Atomic(size_t(duplicationPercentage*double(num)/100.0));
}

__forceinline PrimInfo (size_t num, int numFailed, BBox3f geomBounds, BBox3f centBounds, Atomic* duplications)
__forceinline PrimInfo (size_t num, int numFailed, const BBox3f& geomBounds, const BBox3f& centBounds, Atomic* duplications)
: num(num), numFailed(numFailed), geomBounds(geomBounds), centBounds(centBounds), duplications(duplications) {}

/*! returns the number of primitives */
Expand Down

0 comments on commit c6426e6

Please sign in to comment.