diff options
author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 03:29:33 +0400 |
---|---|---|
committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2013-06-27 03:29:33 +0400 |
commit | 7902fa57b6553c8c6e5ae19d1a25ce2200ea4a95 (patch) | |
tree | 7e07f248cd7aaff6630bedcceff55f35bae2e49b /intern/cycles/kernel | |
parent | 372c4f80f4e8bdec79c9ae6aa0a29c97c9d8797c (diff) |
Code cleanup: cycles
* Reshuffle SSE #ifdefs to try to avoid compilation errors enabling SSE on 32 bit.
* Remove CUDA kernel launch size exception on Mac, is not needed.
* Make OSL file compilation quiet like c/cpp files.
Diffstat (limited to 'intern/cycles/kernel')
-rw-r--r-- | intern/cycles/kernel/kernel_compat_opencl.h | 1 | ||||
-rw-r--r-- | intern/cycles/kernel/kernel_sse2.cpp | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/shaders/CMakeLists.txt | 2 | ||||
-rw-r--r-- | intern/cycles/kernel/shaders/SConscript | 2 |
4 files changed, 3 insertions, 4 deletions
diff --git a/intern/cycles/kernel/kernel_compat_opencl.h b/intern/cycles/kernel/kernel_compat_opencl.h index 2bf3b58ce99..c4cb7a516c2 100644 --- a/intern/cycles/kernel/kernel_compat_opencl.h +++ b/intern/cycles/kernel/kernel_compat_opencl.h @@ -108,7 +108,6 @@ /* data lookup defines */ #define kernel_data (*kg->data) -#define kernel_tex_lookup(t, x, offset, size) kernel_tex_lookup_(kg->t, offset, size, x) #define kernel_tex_fetch(t, index) kg->t[index] /* define NULL */ diff --git a/intern/cycles/kernel/kernel_sse2.cpp b/intern/cycles/kernel/kernel_sse2.cpp index 59852a31047..cfadb02b93b 100644 --- a/intern/cycles/kernel/kernel_sse2.cpp +++ b/intern/cycles/kernel/kernel_sse2.cpp @@ -22,7 +22,7 @@ #ifdef WITH_OPTIMIZED_KERNEL -//#define __KERNEL_SSE2__ +#define __KERNEL_SSE2__ #include "kernel.h" #include "kernel_compat_cpu.h" diff --git a/intern/cycles/kernel/shaders/CMakeLists.txt b/intern/cycles/kernel/shaders/CMakeLists.txt index f2beb3da9c0..23112f56536 100644 --- a/intern/cycles/kernel/shaders/CMakeLists.txt +++ b/intern/cycles/kernel/shaders/CMakeLists.txt @@ -91,7 +91,7 @@ foreach(_file ${SRC_OSL}) string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} _OSO_FILE ${_OSO_FILE}) add_custom_command( OUTPUT ${_OSO_FILE} - COMMAND ${OSL_COMPILER} -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" ${_OSL_FILE} + COMMAND ${OSL_COMPILER} -q -O2 -I"${CMAKE_CURRENT_SOURCE_DIR}" ${_OSL_FILE} DEPENDS ${_OSL_FILE} ${SRC_OSL_HEADERS}) list(APPEND SRC_OSO ${_OSO_FILE} diff --git a/intern/cycles/kernel/shaders/SConscript b/intern/cycles/kernel/shaders/SConscript index daf2b67ad2b..aad6e23e4d4 100644 --- a/intern/cycles/kernel/shaders/SConscript +++ b/intern/cycles/kernel/shaders/SConscript @@ -57,7 +57,7 @@ if env['WITH_BF_CYCLES_OSL']: osl_file = os.path.join(source_dir, f) oso_file = os.path.join(build_dir, f.replace('.osl', '.oso')) - command = "%s -O2 -I%s -o %s %s" % (osl_compiler, source_dir, oso_file, osl_file) + command = "%s -q -O2 -I%s -o %s %s" % (osl_compiler, source_dir, oso_file, osl_file) shaders.Command(oso_file, f, command) shaders.Depends(oso_file, [f] + dependencies) |