[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [36492] branches/particles-2010: Removed OpenCL dependency.
Lukas Toenne
lukas.toenne at googlemail.com
Thu May 5 09:12:20 CEST 2011
Revision: 36492
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=36492
Author: lukastoenne
Date: 2011-05-05 07:12:19 +0000 (Thu, 05 May 2011)
Log Message:
-----------
Removed OpenCL dependency. This was left over from simulation nodes, based on Jeroen Bakker's initial patch, but not in use. Better wait for general OpenCL support framework.
Modified Paths:
--------------
branches/particles-2010/CMakeLists.txt
branches/particles-2010/build_files/cmake/macros.cmake
branches/particles-2010/source/blender/blenkernel/BKE_node.h
branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
branches/particles-2010/source/blender/blenloader/intern/readfile.c
branches/particles-2010/source/blender/makesdna/DNA_node_types.h
branches/particles-2010/source/blender/nodes/CMakeLists.txt
branches/particles-2010/source/blender/nodes/intern/TEX_nodes/TEX_common.c
branches/particles-2010/source/blender/nodes/intern/TEX_nodetree.c
branches/particles-2010/source/creator/CMakeLists.txt
branches/particles-2010/source/creator/creator.c
Removed Paths:
-------------
branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
branches/particles-2010/source/blender/blenkernel/intern/opencl.c
Modified: branches/particles-2010/CMakeLists.txt
===================================================================
--- branches/particles-2010/CMakeLists.txt 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/CMakeLists.txt 2011-05-05 07:12:19 UTC (rev 36492)
@@ -110,7 +110,6 @@
option(WITH_IK_ITASC "Enable ITASC IK solver (only disable for development & for incompatible C++ compilers)" ON)
option(WITH_FFTW3 "Enable FFTW3 support (Used for smoke and audio effects)" OFF)
option(WITH_BULLET "Enable Bullet (Physics Engine)" ON)
-option(WITH_OPENCL "Enable OpenCL" OFF)
option(WITH_GAMEENGINE "Enable Game Engine" ON)
option(WITH_PLAYER "Build Player" OFF)
# (unix defaults to OpenMP On)
@@ -396,10 +395,6 @@
set(FFTW3_LIBPATH ${FFTW3}/lib)
endif()
- if(WITH_OPENCL)
- set(OPENCL_LIB OpenCL)
- endif(WITH_OPENCL)
-
if(WITH_SAMPLERATE)
set(LIBSAMPLERATE /usr)
set(LIBSAMPLERATE_INC ${LIBSAMPLERATE}/include)
Modified: branches/particles-2010/build_files/cmake/macros.cmake
===================================================================
--- branches/particles-2010/build_files/cmake/macros.cmake 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/build_files/cmake/macros.cmake 2011-05-05 07:12:19 UTC (rev 36492)
@@ -109,9 +109,6 @@
if(WITH_FFTW3)
link_directories(${FFTW3_LIBPATH})
endif()
- if(WITH_OPENCL)
- link_directories(${OPENCL_LIBPATH})
- endif(WITH_OPENCL)
if(WITH_OPENCOLLADA)
link_directories(${OPENCOLLADA_LIBPATH})
link_directories(${PCRE_LIBPATH})
@@ -177,9 +174,6 @@
if(WITH_CODEC_QUICKTIME)
target_link_libraries(${target} ${QUICKTIME_LIB})
endif()
- if(WITH_OPENCL)
- target_link_libraries(${target} ${OPENCL_LIB})
- endif(WITH_OPENCL)
if(WITH_IMAGE_TIFF)
target_link_libraries(${target} ${TIFF_LIBRARY})
endif()
Modified: branches/particles-2010/source/blender/blenkernel/BKE_node.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/BKE_node.h 2011-05-05 07:12:19 UTC (rev 36492)
@@ -39,8 +39,6 @@
#include "DNA_listBase.h"
-#include "BKE_opencl.h"
-
#include "RNA_types.h"
/* not very important, but the stack solver likes to know a maximum */
Deleted: branches/particles-2010/source/blender/blenkernel/BKE_opencl.h
===================================================================
--- branches/particles-2010/source/blender/blenkernel/BKE_opencl.h 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/BKE_opencl.h 2011-05-05 07:12:19 UTC (rev 36492)
@@ -1,65 +0,0 @@
-#ifndef BKE_OPENCL_H
-#define BKE_OPENCL_H
-
-#ifdef WITH_OPENCL
-
-#if defined(__APPLE__) || defined(__MACOSX)
-#include <OpenCL/opencl.h>
-#else
-#include <CL/opencl.h>
-#endif
-
-int BKE_opencl_init(void);
-void BKE_opencl_deinit(void);
-
-/**
- * BKE_opencl_is_enabled: returns if the opencl system is enabled
- * 0: System is disabled
- * 1: System is enabled
- */
-int BKE_opencl_is_enabled(void);
-
-/**
- * BKE_opencl_is_active: returns true is the state of opencl is usable
- */
-int BKE_opencl_is_active(void);
-
-/**
- * Translate an opencl result code to a readable message
- */
-char *BKE_opencl_message(cl_int err);
-
-cl_context BKE_opencl_preferred_context(void);
-cl_device_id BKE_opencl_preferred_device(void);
-
-cl_program BKE_opencl_build_source(cl_context context, const char* source, cl_int *resultcode);
-
-typedef struct OpenCLPerformance {
- long init;
- long start;
- int type;
- long total_compile;
- long total_upload;
- long total_download;
- long total_execute;
- long total;
- long other;
-} OpenCLPerformance;
-
-#define PER_COMPILE 1
-#define PER_UPLOAD 2
-#define PER_DOWNLOAD 3
-#define PER_EXECUTE 4
-
-void BKE_opencl_performance_init(OpenCLPerformance *performance);
-void BKE_opencl_performance_start(OpenCLPerformance *performance, int type);
-void BKE_opencl_performance_end(OpenCLPerformance *performance, int type);
-void BKE_opencl_performance_finish(OpenCLPerformance *performance);
-void BKE_opencl_performance_print(OpenCLPerformance *performance, const char* title);
-
-void BKE_opencl_meminfo_print(cl_mem mem);
-void BKE_opencl_contextinfo_print(cl_context ctx);
-
-#endif
-
-#endif
Modified: branches/particles-2010/source/blender/blenkernel/CMakeLists.txt
===================================================================
--- branches/particles-2010/source/blender/blenkernel/CMakeLists.txt 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/CMakeLists.txt 2011-05-05 07:12:19 UTC (rev 36492)
@@ -117,7 +117,6 @@
intern/nla.c
intern/node.c
intern/object.c
- intern/opencl.c
intern/packedFile.c
intern/paint.c
intern/particle.c
@@ -245,11 +244,6 @@
add_definitions(-DWITH_OPENEXR)
endif()
-if(WITH_OPENCL)
- list(APPEND INC /usr/local/cuda/include)
- add_definitions(-DWITH_OPENCL)
-endif(WITH_OPENCL)
-
if(WITH_IMAGE_TIFF)
add_definitions(-DWITH_TIFF)
endif()
Deleted: branches/particles-2010/source/blender/blenkernel/intern/opencl.c
===================================================================
--- branches/particles-2010/source/blender/blenkernel/intern/opencl.c 2011-05-04 20:42:34 UTC (rev 36491)
+++ branches/particles-2010/source/blender/blenkernel/intern/opencl.c 2011-05-05 07:12:19 UTC (rev 36492)
@@ -1,294 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
-
-#include "BKE_opencl.h"
-
-#include "MEM_guardedalloc.h"
-
-#ifdef WITH_OPENCL
-
-static int OPENCL_ENABLED=0;
-static cl_device_id preferred_device;
-static cl_context preferred_context;
-
-char *BKE_opencl_message(cl_int err) {
- switch (err) {
- case CL_SUCCESS: return strdup("Success!");
- case CL_DEVICE_NOT_FOUND: return strdup("Device not found.");
- case CL_DEVICE_NOT_AVAILABLE: return strdup("Device not available");
- case CL_COMPILER_NOT_AVAILABLE: return strdup("Compiler not available");
- case CL_MEM_OBJECT_ALLOCATION_FAILURE: return strdup("Memory object allocation failure");
- case CL_OUT_OF_RESOURCES: return strdup("Out of resources");
- case CL_OUT_OF_HOST_MEMORY: return strdup("Out of host memory");
- case CL_PROFILING_INFO_NOT_AVAILABLE: return strdup("Profiling information not available");
- case CL_MEM_COPY_OVERLAP: return strdup("Memory copy overlap");
- case CL_IMAGE_FORMAT_MISMATCH: return strdup("Image format mismatch");
- case CL_IMAGE_FORMAT_NOT_SUPPORTED: return strdup("Image format not supported");
- case CL_BUILD_PROGRAM_FAILURE: return strdup("Program build failure");
- case CL_MAP_FAILURE: return strdup("Map failure");
- case CL_INVALID_VALUE: return strdup("Invalid value");
- case CL_INVALID_DEVICE_TYPE: return strdup("Invalid device type");
- case CL_INVALID_PLATFORM: return strdup("Invalid platform");
- case CL_INVALID_DEVICE: return strdup("Invalid device");
- case CL_INVALID_CONTEXT: return strdup("Invalid context");
- case CL_INVALID_QUEUE_PROPERTIES: return strdup("Invalid queue properties");
- case CL_INVALID_COMMAND_QUEUE: return strdup("Invalid command queue");
- case CL_INVALID_HOST_PTR: return strdup("Invalid host pointer");
- case CL_INVALID_MEM_OBJECT: return strdup("Invalid memory object");
- case CL_INVALID_IMAGE_FORMAT_DESCRIPTOR: return strdup("Invalid image format descriptor");
- case CL_INVALID_IMAGE_SIZE: return strdup("Invalid image size");
- case CL_INVALID_SAMPLER: return strdup("Invalid sampler");
- case CL_INVALID_BINARY: return strdup("Invalid binary");
- case CL_INVALID_BUILD_OPTIONS: return strdup("Invalid build options");
- case CL_INVALID_PROGRAM: return strdup("Invalid program");
- case CL_INVALID_PROGRAM_EXECUTABLE: return strdup("Invalid program executable");
- case CL_INVALID_KERNEL_NAME: return strdup("Invalid kernel name");
- case CL_INVALID_KERNEL_DEFINITION: return strdup("Invalid kernel definition");
- case CL_INVALID_KERNEL: return strdup("Invalid kernel");
- case CL_INVALID_ARG_INDEX: return strdup("Invalid argument index");
- case CL_INVALID_ARG_VALUE: return strdup("Invalid argument value");
- case CL_INVALID_ARG_SIZE: return strdup("Invalid argument size");
- case CL_INVALID_KERNEL_ARGS: return strdup("Invalid kernel arguments");
- case CL_INVALID_WORK_DIMENSION: return strdup("Invalid work dimension");
- case CL_INVALID_WORK_GROUP_SIZE: return strdup("Invalid work group size");
- case CL_INVALID_WORK_ITEM_SIZE: return strdup("Invalid work item size");
- case CL_INVALID_GLOBAL_OFFSET: return strdup("Invalid global offset");
- case CL_INVALID_EVENT_WAIT_LIST: return strdup("Invalid event wait list");
- case CL_INVALID_EVENT: return strdup("Invalid event");
- case CL_INVALID_OPERATION: return strdup("Invalid operation");
- case CL_INVALID_GL_OBJECT: return strdup("Invalid OpenGL object");
- case CL_INVALID_BUFFER_SIZE: return strdup("Invalid buffer size");
- case CL_INVALID_MIP_LEVEL: return strdup("Invalid mip-map level");
- default: return strdup("Unknown");
- }
-}
-
-static void error_callback(const char *errinfo, const void *private_info, size_t cb, void *user_data)
-{
- printf("OpenCL error: %s\n", errinfo);
-}
-
-int BKE_opencl_init() {
- cl_platform_id *platforms;
- cl_device_id *devices;
-
- cl_uint numPlatforms;
- cl_uint numDevices;
-#ifdef DEBUG
- char platformName[80];
- char platformProfile[80];
- char platformVersion[80];
- char platformVendor[80];
-#endif
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list