[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40350] branches/cycles: Cycles: remove deprecated strict aliasing flag for opencl, fix missing update
Brecht Van Lommel
brechtvanlommel at pandora.be
Mon Sep 19 13:57:31 CEST 2011
Revision: 40350
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40350
Author: blendix
Date: 2011-09-19 11:57:31 +0000 (Mon, 19 Sep 2011)
Log Message:
-----------
Cycles: remove deprecated strict aliasing flag for opencl, fix missing update
modifying object layer in properties editor, and add memarena utility.
Modified Paths:
--------------
branches/cycles/intern/cycles/device/device_opencl.cpp
branches/cycles/intern/cycles/util/CMakeLists.txt
branches/cycles/intern/cycles/util/util_transform.h
branches/cycles/source/blender/makesrna/intern/rna_object.c
Added Paths:
-----------
branches/cycles/intern/cycles/util/util_memarena.cpp
branches/cycles/intern/cycles/util/util_memarena.h
Modified: branches/cycles/intern/cycles/device/device_opencl.cpp
===================================================================
--- branches/cycles/intern/cycles/device/device_opencl.cpp 2011-09-19 11:55:45 UTC (rev 40349)
+++ branches/cycles/intern/cycles/device/device_opencl.cpp 2011-09-19 11:57:31 UTC (rev 40350)
@@ -264,7 +264,7 @@
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);
Modified: branches/cycles/intern/cycles/util/CMakeLists.txt
===================================================================
--- branches/cycles/intern/cycles/util/CMakeLists.txt 2011-09-19 11:55:45 UTC (rev 40349)
+++ branches/cycles/intern/cycles/util/CMakeLists.txt 2011-09-19 11:57:31 UTC (rev 40350)
@@ -9,6 +9,7 @@
util_cuda.cpp
util_dynlib.cpp
util_md5.cpp
+ util_memarena.cpp
util_opencl.c
util_path.cpp
util_string.cpp
@@ -35,6 +36,7 @@
util_map.h
util_math.h
util_md5.h
+ util_memarena.h
util_opencl.h
util_opengl.h
util_param.h
Added: branches/cycles/intern/cycles/util/util_memarena.cpp
===================================================================
--- branches/cycles/intern/cycles/util/util_memarena.cpp (rev 0)
+++ branches/cycles/intern/cycles/util/util_memarena.cpp 2011-09-19 11:57:31 UTC (rev 40350)
@@ -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
+
Added: branches/cycles/intern/cycles/util/util_memarena.h
===================================================================
--- branches/cycles/intern/cycles/util/util_memarena.h (rev 0)
+++ branches/cycles/intern/cycles/util/util_memarena.h 2011-09-19 11:57:31 UTC (rev 40350)
@@ -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__ */
+
Modified: branches/cycles/intern/cycles/util/util_transform.h
===================================================================
--- branches/cycles/intern/cycles/util/util_transform.h 2011-09-19 11:55:45 UTC (rev 40349)
+++ branches/cycles/intern/cycles/util/util_transform.h 2011-09-19 11:57:31 UTC (rev 40350)
@@ -30,6 +30,11 @@
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)
Modified: branches/cycles/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/cycles/source/blender/makesrna/intern/rna_object.c 2011-09-19 11:55:45 UTC (rev 40349)
+++ branches/cycles/source/blender/makesrna/intern/rna_object.c 2011-09-19 11:57:31 UTC (rev 40350)
@@ -284,6 +284,8 @@
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)
More information about the Bf-blender-cvs
mailing list