[Bf-blender-cvs] [da59443] soc-2016-cycles_denoising: Fix two compilation issues
Lukas Stockner
noreply at git.blender.org
Tue Aug 23 23:01:33 CEST 2016
Commit: da59443ed9854c346f8a45f0023a805288d3ce0a
Author: Lukas Stockner
Date: Tue Aug 23 23:01:11 2016 +0200
Branches: soc-2016-cycles_denoising
https://developer.blender.org/rBda59443ed9854c346f8a45f0023a805288d3ce0a
Fix two compilation issues
===================================================================
M CMakeLists.txt
M intern/cycles/util/util_system.cpp
M intern/cycles/util/util_system.h
M source/blenderplayer/bad_level_call_stubs/stubs.c
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f264d05..7426afb 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -724,6 +724,9 @@ if(WITH_CYCLES)
if(WITH_CYCLES_OSL)
set(WITH_LLVM ON CACHE BOOL "" FORCE)
endif()
+ if(WITH_CYCLES_DEBUG_FPE AND APPLE)
+ message(FATAL_ERROR "WITH_CYCLES_DEBUG_FPE is not supported on OSX!")
+ endif()
else()
set(WITH_CYCLES_OSL OFF)
endif()
diff --git a/intern/cycles/util/util_system.cpp b/intern/cycles/util/util_system.cpp
index 9e51f24..1001c28 100644
--- a/intern/cycles/util/util_system.cpp
+++ b/intern/cycles/util/util_system.cpp
@@ -282,6 +282,7 @@ bool system_cpu_support_avx2()
#endif
+#ifdef WITH_CYCLES_DEBUG_FPE
static void system_enable_fpe()
{
#ifdef __GNUC__
@@ -330,5 +331,7 @@ scoped_fpe::~scoped_fpe()
}
}
+#endif
+
CCL_NAMESPACE_END
diff --git a/intern/cycles/util/util_system.h b/intern/cycles/util/util_system.h
index 83cee1b..c627c9e 100644
--- a/intern/cycles/util/util_system.h
+++ b/intern/cycles/util/util_system.h
@@ -38,6 +38,7 @@ bool system_cpu_support_sse41();
bool system_cpu_support_avx();
bool system_cpu_support_avx2();
+#ifdef WITH_CYCLES_DEBUG_FPE
typedef enum FPEState
{
FPE_ENABLED,
@@ -52,6 +53,7 @@ public:
private:
bool was_enabled;
};
+#endif
CCL_NAMESPACE_END
diff --git a/source/blenderplayer/bad_level_call_stubs/stubs.c b/source/blenderplayer/bad_level_call_stubs/stubs.c
index 0451d66..d51c78f 100644
--- a/source/blenderplayer/bad_level_call_stubs/stubs.c
+++ b/source/blenderplayer/bad_level_call_stubs/stubs.c
@@ -651,7 +651,7 @@ struct RenderData *RE_engine_get_render_data(struct Render *re) RET_NULL
void RE_engine_update_result(struct RenderEngine *engine, struct RenderResult *result) RET_NONE
void RE_engine_update_progress(struct RenderEngine *engine, float progress) RET_NONE
void RE_engine_set_error_message(RenderEngine *engine, const char *msg) RET_NONE
-void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int merge_results) RET_NONE
+void RE_engine_end_result(RenderEngine *engine, struct RenderResult *result, int cancel, int highlight, int merge_results) RET_NONE
void RE_engine_update_stats(RenderEngine *engine, const char *stats, const char *info) RET_NONE
void RE_layer_load_from_file(struct RenderLayer *layer, struct ReportList *reports, const char *filename, int x, int y) RET_NONE
void RE_result_load_from_file(struct RenderResult *result, struct ReportList *reports, const char *filename) RET_NONE
More information about the Bf-blender-cvs
mailing list