mingzailao
/
mitsuba
mirror of https://github.com/Quartenia/mitsuba.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

heterogeneous medium: don't require an orientation field

metadata
Wenzel Jakob 2010-12-01 01:27:33 +01:00
parent c2d7903f54
commit 20f3b7e0dc
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/mitsuba/core/sse.h
View File

@ -51,6 +51,7 @@
#ifndef MTS_SSE
#define SSE_STR "SSE2 disabled"
#define enable_fpexcept_sse()
#define query_fpexcept_sse() 0
#define disable_fpexcept_sse()
#else
/* Include SSE intrinsics header file */
@ -61,8 +62,9 @@
#define splat_epi32(ps, i) _mm_shuffle_epi32((ps), (i<<6) | (i<<4) | (i<<2) | i)
#define mux_ps(sel, op1, op2) _mm_or_ps (_mm_and_ps ((sel), (op1)), _mm_andnot_ps ((sel), (op2)))
#define mux_epi32(sel, op1, op2) _mm_or_si128(_mm_and_si128((sel), (op1)), _mm_andnot_si128((sel), (op2)))
#define enable_fpexcept_sse() _MM_SET_EXCEPTION_MASK(_MM_GET_EXCEPTION_MASK() & ~(_MM_MASK_INVALID| _MM_MASK_DIV_ZERO))
#define disable_fpexcept_sse() _MM_SET_EXCEPTION_MASK(_MM_GET_EXCEPTION_MASK() | (_MM_MASK_INVALID| _MM_MASK_DIV_ZERO))
#define enable_fpexcept_sse() _MM_SET_EXCEPTION_MASK(_MM_GET_EXCEPTION_MASK() & ~(_MM_MASK_INVALID | _MM_MASK_DIV_ZERO))
#define query_fpexcept_sse() (~_MM_GET_EXCEPTION_MASK() & (_MM_MASK_INVALID | _MM_MASK_DIV_ZERO))
#define disable_fpexcept_sse() _MM_SET_EXCEPTION_MASK(_MM_GET_EXCEPTION_MASK() | (_MM_MASK_INVALID | _MM_MASK_DIV_ZERO))
#define load1_epi32(i) _mm_shuffle_epi32(_mm_cvtsi32_si128(i), 0)
#ifdef __MSVC__

9
src/libcore/util.cpp
View File

@ -248,6 +248,11 @@ bool enableFPExceptions() {
exceptionsWereEnabled = ~cw & (_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW);
cw &= ~(_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW);
_controlfp(cw, _MCW_EM);
#elif defined(__OSX__)
#if !defined(MTS_SSE)
#error SSE must be enabled to handle FP exceptions on OSX
#endif
exceptionsWereEnabled = query_fpexcept_sse() != 0;
#else
exceptionsWereEnabled =
fegetexcept() & (FE_INVALID|FE_DIVBYZERO|FE_OVERFLOW);
@ -267,6 +272,8 @@ bool disableFPExceptions() {
exceptionsWereEnabled = ~cw & (_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW);
cw |= _EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW;
_controlfp(cw, _MCW_EM);
#elif defined(__OSX__)
exceptionsWereEnabled = query_fpexcept_sse() != 0;
#else
exceptionsWereEnabled =
fegetexcept() & (FE_INVALID|FE_DIVBYZERO|FE_OVERFLOW);
@ -283,6 +290,8 @@ void restoreFPExceptions(bool oldState) {
#if defined(WIN32)
unsigned int cw = _controlfp(0, 0);
currentState = ~cw & (_EM_INVALID | _EM_ZERODIVIDE | _EM_OVERFLOW);
#elif defined(__OSX__)
currentState = query_fpexcept_sse() != 0;
#else
currentState = fegetexcept() & (FE_INVALID|FE_DIVBYZERO|FE_OVERFLOW);
#endif

11
src/medium/heterogeneous-stencil.cpp
View File

@ -76,7 +76,7 @@ public:
if (m_albedo.get() == NULL)
Log(EError, "No albedo specified!");
if (m_orientations.get() == NULL)
Log(EError, "No orientations specified!");
Log(EWarn, "No orientations specified!");
if (m_shapes.size() != 0) {
m_kdTree->build();
@ -86,9 +86,11 @@ public:
}
if (m_stepSize == 0) {
m_stepSize = std::min(std::min(
m_stepSize = std::min(
m_densities->getStepSize(),
m_albedo->getStepSize()),
m_albedo->getStepSize());
if (m_orientations)
m_stepSize = std::min(m_stepSize,
m_orientations->getStepSize());
if (m_stepSize == std::numeric_limits<Float>::infinity())
@ -329,7 +331,8 @@ public:
mRec.sigmaS = currentAlbedo * currentSigmaT;
mRec.sigmaA = Spectrum(currentSigmaT) - mRec.sigmaS;
mRec.albedo = currentAlbedo.max();
mRec.orientation = m_orientations->lookupVector(mRec.p);
mRec.orientation = m_orientations.get()
? m_orientations->lookupVector(mRec.p) : Vector(0.0f);
mRec.medium = this;
return true;
}