forked from bartvdbraak/blender
Building with C++ guarded alloc works again
This commit is contained in:
parent
5c4bb81e49
commit
cf01f2c760
@ -23,6 +23,10 @@
|
|||||||
#ifndef _COM_Converter_h
|
#ifndef _COM_Converter_h
|
||||||
#define _COM_Converter_h
|
#define _COM_Converter_h
|
||||||
|
|
||||||
|
#ifdef WITH_CXX_GUARDEDALLOC
|
||||||
|
# include "MEM_guardedalloc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
struct bNode;
|
struct bNode;
|
||||||
|
|
||||||
class Node;
|
class Node;
|
||||||
|
@ -399,7 +399,7 @@ void ExecutionGroup::printBackgroundStats(void)
|
|||||||
|
|
||||||
BLI_timestr(execution_time, timestr, sizeof(timestr));
|
BLI_timestr(execution_time, timestr, sizeof(timestr));
|
||||||
printf("| Elapsed %s ", timestr);
|
printf("| Elapsed %s ", timestr);
|
||||||
printf("| Tree %s, Tile %d-%d ", this->m_bTree->id.name + 2,
|
printf("| Tree %s, Tile %u-%u ", this->m_bTree->id.name + 2,
|
||||||
this->m_chunksFinished, this->m_numberOfChunks);
|
this->m_chunksFinished, this->m_numberOfChunks);
|
||||||
|
|
||||||
fputc('\n', stdout);
|
fputc('\n', stdout);
|
||||||
|
@ -22,6 +22,10 @@
|
|||||||
#ifndef _COM_NodeCompiler_h
|
#ifndef _COM_NodeCompiler_h
|
||||||
#define _COM_NodeCompiler_h
|
#define _COM_NodeCompiler_h
|
||||||
|
|
||||||
|
#ifdef WITH_CXX_GUARDEDALLOC
|
||||||
|
# include "MEM_guardedalloc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
class NodeInput;
|
class NodeInput;
|
||||||
class NodeOutput;
|
class NodeOutput;
|
||||||
|
|
||||||
|
@ -30,6 +30,10 @@ extern "C" {
|
|||||||
#include "DNA_node_types.h"
|
#include "DNA_node_types.h"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifdef WITH_CXX_GUARDEDALLOC
|
||||||
|
# include "MEM_guardedalloc.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
class CompositorContext;
|
class CompositorContext;
|
||||||
class Node;
|
class Node;
|
||||||
class NodeInput;
|
class NodeInput;
|
||||||
|
@ -335,7 +335,7 @@ void WorkScheduler::initialize(bool use_opencl, int num_cpu_threads)
|
|||||||
error = clGetPlatformIDs(0, 0, &numberOfPlatforms);
|
error = clGetPlatformIDs(0, 0, &numberOfPlatforms);
|
||||||
if (error == -1001) { } /* GPU not supported */
|
if (error == -1001) { } /* GPU not supported */
|
||||||
else if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
|
else if (error != CL_SUCCESS) { printf("CLERROR[%d]: %s\n", error, clewErrorString(error)); }
|
||||||
if (G.f & G_DEBUG) printf("%d number of platforms\n", numberOfPlatforms);
|
if (G.f & G_DEBUG) printf("%u number of platforms\n", numberOfPlatforms);
|
||||||
cl_platform_id *platforms = (cl_platform_id *)MEM_mallocN(sizeof(cl_platform_id) * numberOfPlatforms, __func__);
|
cl_platform_id *platforms = (cl_platform_id *)MEM_mallocN(sizeof(cl_platform_id) * numberOfPlatforms, __func__);
|
||||||
error = clGetPlatformIDs(numberOfPlatforms, platforms, 0);
|
error = clGetPlatformIDs(numberOfPlatforms, platforms, 0);
|
||||||
unsigned int indexPlatform;
|
unsigned int indexPlatform;
|
||||||
|
Loading…
Reference in New Issue
Block a user