Cycles: remove deprecated strict aliasing flag for opencl, fix missing update

modifying object layer in properties editor, and add memarena utility.

diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp
index a87b12786b1e2b5b03c48a015e204f4587f88c09..bd26f4a78fb57325930e41a31d19689fd0fd08cb 100644 (file)
--- a/intern/cycles/device/device_opencl.cpp
+++ b/intern/cycles/device/device_opencl.cpp
@@ -264,7 +264,7 @@ public:
                string build_options = "";
 
                build_options += "-I " + kernel_path + ""; /* todo: escape path */
                string build_options = "";
 
                build_options += "-I " + kernel_path + ""; /* todo: escape path */

-               build_options += " -cl-fast-relaxed-math -cl-strict-aliasing";
+               build_options += " -cl-fast-relaxed-math ";

 
                ciErr = clBuildProgram(cpProgram, 0, NULL, build_options.c_str(), NULL, NULL);
 
 
                ciErr = clBuildProgram(cpProgram, 0, NULL, build_options.c_str(), NULL, NULL);
 

diff --git a/intern/cycles/util/CMakeLists.txt b/intern/cycles/util/CMakeLists.txt
index 3adf483643f29f318590e7f1abc52f56d53fe524..a7f7c66350940df391eb695b495773b5ed50e710 100644 (file)
--- a/intern/cycles/util/CMakeLists.txt
+++ b/intern/cycles/util/CMakeLists.txt
@@ -9,6 +9,7 @@ set(sources
        util_cuda.cpp
        util_dynlib.cpp
        util_md5.cpp
        util_cuda.cpp
        util_dynlib.cpp
        util_md5.cpp

+       util_memarena.cpp

        util_opencl.c
        util_path.cpp
        util_string.cpp
        util_opencl.c
        util_path.cpp
        util_string.cpp


@@ -35,6 +36,7 @@ set(headers
        util_map.h
        util_math.h
        util_md5.h
        util_map.h
        util_math.h
        util_md5.h

+       util_memarena.h

        util_opencl.h
        util_opengl.h
        util_param.h
        util_opencl.h
        util_opengl.h
        util_param.h

diff --git a/intern/cycles/util/util_memarena.cpp b/intern/cycles/util/util_memarena.cpp
new file mode 100644 (file)
index 0000000..e7ae0d6
--- /dev/null
+++ b/intern/cycles/util/util_memarena.cpp
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#include "util_foreach.h"
+#include "util_math.h"
+#include "util_memarena.h"
+
+CCL_NAMESPACE_BEGIN
+
+MemArena::MemArena(bool use_calloc_, size_t buffer_size_)
+{
+       use_calloc = use_calloc_;
+       buffer_size = buffer_size_;
+
+       last_left = 0;
+       last_buffer = NULL;
+}
+
+MemArena::~MemArena()
+{
+       foreach(uint8_t *buffer, buffers)
+               delete [] buffer;
+}
+
+void *MemArena::alloc(size_t size)
+{
+       if(size > last_left) {
+               last_left = (size > buffer_size)? size: buffer_size;
+               last_buffer = new uint8_t[last_left];
+
+               if(use_calloc)
+                       memset(last_buffer, 0, last_left);
+
+               buffers.push_back(last_buffer);
+       }
+
+       uint8_t *mem = last_buffer;
+
+       last_buffer += size;
+       last_left -= size;
+
+       return (void*)mem;
+}
+
+CCL_NAMESPACE_END
+

diff --git a/intern/cycles/util/util_memarena.h b/intern/cycles/util/util_memarena.h
new file mode 100644 (file)
index 0000000..3b4b761
--- /dev/null
+++ b/intern/cycles/util/util_memarena.h
@@ -0,0 +1,48 @@
+/*
+ * Copyright 2011, Blender Foundation.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+
+#ifndef __UTIL_MEMARENA_H__
+#define __UTIL_MEMARENA_H__
+
+#include <stdlib.h>
+
+#include "util_list.h"
+#include "util_types.h"
+
+CCL_NAMESPACE_BEGIN
+
+class MemArena {
+public:
+       MemArena(bool use_calloc = true, size_t buffer_size = (1<<14));
+       ~MemArena();
+
+       void *alloc(size_t size);
+
+protected:
+       bool use_calloc;
+       size_t buffer_size;
+
+       list<uint8_t*> buffers;
+       uint8_t *last_buffer;
+       size_t last_left;
+};
+
+CCL_NAMESPACE_END
+
+#endif /* __UTIL_MEMARENA_H__ */
+

diff --git a/intern/cycles/util/util_transform.h b/intern/cycles/util/util_transform.h
index 998d4161ebf972995f01f2642ccafa8632e93f3d..c43736fb2e402b50802f050537f93ef4af345c22 100644 (file)
--- a/intern/cycles/util/util_transform.h
+++ b/intern/cycles/util/util_transform.h
@@ -30,6 +30,11 @@ CCL_NAMESPACE_BEGIN
 
 typedef struct Transform {
        float4 x, y, z, w; /* rows */
 
 typedef struct Transform {
        float4 x, y, z, w; /* rows */

+
+#ifndef __KERNEL_GPU__
+       float4 operator[](int i) const { return *(&x + i); }
+       float4& operator[](int i) { return *(&x + i); }
+#endif

 } Transform;
 
 __device_inline float3 transform(const Transform *t, const float3 a)
 } Transform;
 
 __device_inline float3 transform(const Transform *t, const float3 a)

diff --git a/source/blender/makesrna/intern/rna_object.c b/source/blender/makesrna/intern/rna_object.c
index a27b6b2d72c462fcffec19aec1242517c893fcd3..790c24ba2d7b28edff97bfdaad9fe7562375bf8a 100644 (file)
--- a/source/blender/makesrna/intern/rna_object.c
+++ b/source/blender/makesrna/intern/rna_object.c
@@ -284,6 +284,8 @@ static void rna_Object_layer_update__internal(Main *bmain, Scene *scene, Base *b
        else {
                DAG_scene_sort(bmain, scene);
        }
        else {
                DAG_scene_sort(bmain, scene);
        }

+
+       DAG_id_type_tag(bmain, ID_OB);

 }
 
 static void rna_Object_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)
 }
 
 static void rna_Object_layer_update(Main *bmain, Scene *scene, PointerRNA *ptr)