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

hslt: compile fixes

metadata
johannes hanika 2014-11-03 17:28:19 +01:00 committed by Wenzel Jakob
parent b821dc9e33
commit 7e705a62a0
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/mitsuba/core/rfilter.h
View File

@ -124,7 +124,7 @@ template <typename Scalar> struct Resampler {
int sourceRes, int targetRes) : m_bc(bc), m_sourceRes(sourceRes), m_targetRes(targetRes), int sourceRes, int targetRes) : m_bc(bc), m_sourceRes(sourceRes), m_targetRes(targetRes),
m_start(NULL), m_weights(NULL) { m_start(NULL), m_weights(NULL) {
SAssert(sourceRes > 0 && targetRes > 0); SAssert(sourceRes > 0 && targetRes > 0);
Float filterRadius = rfilter->getRadius(), scale = 1.0f, invScale = 1.0f; Float filterRadius = rfilter->getRadius(), scale = (Float)1.0, invScale = (Float)1.0;
/* Low-pass filter: scale reconstruction filters when downsampling */ /* Low-pass filter: scale reconstruction filters when downsampling */
if (targetRes < sourceRes) { if (targetRes < sourceRes) {

6
src/mtsgui/simdtonemap.cpp
View File

@ -520,13 +520,13 @@ bool luminance(const mitsuba::Bitmap* source, const float multiplier,
V4i tailMask = V4i::zero(); V4i tailMask = V4i::zero();
switch (pixelCount % 4) { switch (pixelCount % 4) {
case 1: case 1:
tailMask = V4i::constant<0, 0x00000000, 0x00000000, 0xffffffff>(); tailMask = V4i::constant<0, 0, 0, -1>();
break; break;
case 2: case 2:
tailMask = V4i::constant<0, 0x00000000, 0xffffffff, 0xffffffff>(); tailMask = V4i::constant<0, 0, -1, -1>();
break; break;
case 3: case 3:
tailMask = V4i::constant<0, 0xffffffff, 0xffffffff, 0xffffffff>(); tailMask = V4i::constant<0, -1, -1, -1>();
break; break;
} }
// maxLuminance contains zeros in the invalid positions which is OK // maxLuminance contains zeros in the invalid positions which is OK