diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-05 11:09:39 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-02-06 21:19:20 +0300 |
commit | f25f7c803020b9341e49e898abe94917c3235515 (patch) | |
tree | 17754b6b7f4d4037ba4cadb2a55657952c1aeb79 /intern/cycles/render/shader.h | |
parent | 7623d3e071e6356ce4519073b1a29d984ba86cd9 (diff) |
Cycles: Re-implement some utilities to avoid use of boost
The title says it all actually, the idea is to make Cycles
only requiring Boost via 3rd party dependencies like OIIO
and OSL.
So now there are only few places which still uses Boost:
- Foreach, function bindings and threading primitives.
Those we can easily get rid with C++11 bump (which seems
inevitable sooner or later if we'll want ot use newer
LLVM for OSL),
- Networking devices
There's no quick solution for those currently, but there
are some patches around which improves serialization.
Reviewers: juicyfruit, mont29, campbellbarton, brecht, dingto
Reviewed By: brecht, dingto
Differential Revision: https://developer.blender.org/D1764
Diffstat (limited to 'intern/cycles/render/shader.h')
-rw-r--r-- | intern/cycles/render/shader.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/intern/cycles/render/shader.h b/intern/cycles/render/shader.h index cc83ad03277..6f4fd0e7797 100644 --- a/intern/cycles/render/shader.h +++ b/intern/cycles/render/shader.h @@ -18,15 +18,8 @@ #define __SHADER_H__ #ifdef WITH_OSL -# if defined(_MSC_VER) -/* Prevent OSL from polluting the context with weird macros from windows.h. - * TODO(sergey): Ideally it's only enough to have class/struct declarations in - * the header and skip header include here. - */ -# define NOGDI -# define NOMINMAX -# define WIN32_LEAN_AND_MEAN -# endif +/* So no context pollution happens from indirectly included windows.h */ +# include "util_windows.h" # include <OSL/oslexec.h> #endif |