diff options
| author | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
|---|---|---|
| committer | Brecht Van Lommel <brechtvanlommel@pandora.be> | 2012-05-13 16:32:44 +0400 |
| commit | dd9c1b7fbf501ef58c9952150698fb5ce3c45903 (patch) | |
| tree | f52d353e3dc36a33a3a8b6609fa8a2ffe39b2d4c /intern/cycles/device/device_opencl.cpp | |
| parent | f9642926303ec89679e61076ca9e4b9f0be3afe9 (diff) | |
Cycles: OpenCL image texture support, fix an attribute node issue and refactor
feature enabling #defines a bit.
Diffstat (limited to 'intern/cycles/device/device_opencl.cpp')
| -rw-r--r-- | intern/cycles/device/device_opencl.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/intern/cycles/device/device_opencl.cpp b/intern/cycles/device/device_opencl.cpp index 322b7ad3eb9..09235506048 100644 --- a/intern/cycles/device/device_opencl.cpp +++ b/intern/cycles/device/device_opencl.cpp @@ -212,7 +212,7 @@ public: { char version[256]; - int major, minor, req_major = 1, req_minor = 1; + int major, minor, req_major = 1, req_minor = 0; clGetPlatformInfo(cpPlatform, CL_PLATFORM_VERSION, sizeof(version), &version, NULL); @@ -300,15 +300,15 @@ public: /* Multi Closure for nVidia cards */ if(platform_name == "NVIDIA CUDA") - build_options += "-D__KERNEL_SHADING__ -D__MULTI_CLOSURE__ -cl-nv-maxrregcount=24 -cl-nv-verbose "; + build_options += "-D__KERNEL_SHADING__ -D__KERNEL_OPENCL_NVIDIA__ -cl-nv-maxrregcount=24 -cl-nv-verbose "; /* No Float3 for Apple */ else if(platform_name == "Apple") - build_options += "-D__CL_NO_FLOAT3__ "; + build_options += "-D__CL_NO_FLOAT3__ -D__KERNEL_OPENCL_APPLE__ "; /* Basic shading for AMD cards (non Apple) */ else if(platform_name == "AMD Accelerated Parallel Processing") - build_options += "-D__KERNEL_SHADING__ -D__CL_NO_FLOAT3__ "; + build_options += "-D__CL_NO_FLOAT3__ -D__KERNEL_OPENCL_AMD__ "; return build_options; } @@ -743,6 +743,7 @@ void device_opencl_info(vector<DeviceInfo>& devices) /* we don't know if it's used for display, but assume it is */ info.display_device = true; info.advanced_shading = false; + info.pack_images = true; devices.push_back(info); } |