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

icl fixes

metadata
Wenzel Jakob 2011-06-01 11:53:20 -07:00
parent f0ccbc4ba7
commit c1c222eb94
5 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/config-icl12-msv2010-win32.py
View File

@ -2,12 +2,12 @@ BUILDDIR = '#build/release'
CXX = 'icl'
CC = 'icl'
LINK = 'xilink'
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/W3', '/Qdiag-disable:2586', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
SHCXXFLAGS = CXXFLAGS
TARGET_ARCH = 'x86'
MSVC_VERSION = '10.0'
INTEL_COMPILER = True
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST']
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X86', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/NODEFAULTLIB:LIBCMT', '/MANIFEST', '/Qdiag-disable:11024']
BASEINCLUDE = ['#include', '#dependencies/windows/include']
BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32']
OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR']

4
build/config-icl12-msv2010-win64.py
View File

@ -2,12 +2,12 @@ BUILDDIR = '#build/release'
CXX = 'icl'
CC = 'icl'
LINK = 'xilink'
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
CXXFLAGS = ['/nologo', '/O3', '/Qipo', '/QxSSE2', '/QaxSSE3,SSE4.2', '/fp:fast=2', '/D', 'WIN32', '/D', 'WIN64', '/W3', '/Qdiag-disable:2586', '/EHsc', '/GS-', '/MD', '/D', 'MTS_DEBUG', '/D', 'SINGLE_PRECISION', '/D', 'MTS_SSE', '/D', 'MTS_HAS_COHERENT_RT', '/D', '_CONSOLE', '/D', 'NDEBUG', '/Qopenmp']
SHCXXFLAGS = CXXFLAGS
TARGET_ARCH = 'x86_64'
MSVC_VERSION = '10.0'
INTEL_COMPILER = True
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/LTCG', '/NODEFAULTLIB:LIBCMT', '/MANIFEST']
LINKFLAGS = ['/nologo', '/SUBSYSTEM:CONSOLE', '/MACHINE:X64', '/FIXED:NO', '/OPT:REF', '/OPT:ICF', '/NODEFAULTLIB:LIBCMT', '/MANIFEST', '/Qdiag-disable:11024']
BASEINCLUDE = ['#include', '#dependencies/windows/include']
BASELIB = ['pthreadVCE2', 'msvcrt', 'ws2_32']
OEXRINCLUDE = ['#dependencies/windows/include/OpenEXR']

4
include/mitsuba/render/gkdtree.h
View File

@ -617,7 +617,9 @@ protected:
#if defined(WIN32)
/* Use strict IEEE 754 floating point computations
for the following kd-tree building code */
MTS_NAMESPACE_END
#pragma float_control(precise, on)
MTS_NAMESPACE_BEGIN
#endif
#define KDLog(level, fmt, ...) Thread::getThread()->getLogger()->log(\
@ -2636,7 +2638,9 @@ protected:
#if defined(WIN32)
/* Revert back to fast / non-strict IEEE 754
floating point computations */
MTS_NAMESPACE_END
#pragma float_control(precise, off)
MTS_NAMESPACE_BEGIN
#endif
template <typename AABBType>

2
src/shapes/ply/ply.cpp
View File

@ -418,7 +418,7 @@ void PLYLoader::loadPLY(const fs::path &path) {
ply::at<ply::uint32, ply::int32>(list_property_definition_callbacks) = std::tr1::bind(
&PLYLoader::list_property_definition_callback<ply::uint32, ply::int32>, this, _1, _2);
ply::at<ply::uint8, ply::uint32>(list_property_definition_callbacks) = std::tr1::bind(
&PLYLoader::list_property_definition_callback<ply::uint8, ply::uint32>, this, _1, _2);

11
src/shapes/ply/ply/ply_parser.hpp
View File

@ -17,6 +17,11 @@
# else
# define MTS_USE_BOOST_TR1 0
# endif
#define ADT_WORKAROUND 1
#endif
#if defined(__INTEL_COMPILER)
#define ADT_WORKAROUND 1
#endif
#if MTS_USE_BOOST_TR1
@ -118,7 +123,7 @@ public:
{
return static_cast<callbacks_element<ScalarType>&>(callbacks_).callback;
}
#if !defined(__clang__)
#if !defined(ADT_WORKAROUND)
template <typename ScalarType>
friend typename scalar_property_definition_callback_type<ScalarType>::type& at(scalar_property_definition_callbacks_type& scalar_property_definition_callbacks)
{
@ -210,7 +215,7 @@ public:
{
return static_cast<const callbacks_element<boost::mpl::pair<SizeType, ScalarType> >&>(callbacks_).callback;
}
#if !defined(__clang__)
#if !defined(ADT_WORKAROUND)
template <typename SizeType, typename ScalarType>
friend typename list_property_definition_callback_type<SizeType, ScalarType>::type& at(list_property_definition_callbacks_type& list_property_definition_callbacks)
{
@ -549,7 +554,7 @@ inline bool ply::ply_parser::parse_list_property(format_type format, std::istrea
}
}
#if defined(__clang__)
#if defined(ADT_WORKAROUND)
// Horrible workaround for ADT failure as of Clang 2.8
namespace ply
{