Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Cycles: OpenCL tweaks

Browse Source 
* Reduce kernel arguments size, helps compile for apple nvidia.
* Fix use of unitialized variable in displace kernel.
* Use build flags in opencl kernel md5 hash.
* Reorganize code for kernel feature #defines a bit.
This commit is contained in:
Brecht Van Lommel
2011-11-22 13:15:19 +00:00
parent c71e31eb4f
commit 47853bf6f6
10 changed files with 66 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
intern/cycles/kernel/kernel.cl
View File

@@ -33,8 +33,7 @@ __kernel void kernel_ocl_path_trace(
__global uint *rng_state,
#define KERNEL_TEX(type, ttype, name) \
__global type *name, \
int name##_width,
__global type *name,
#include "kernel_textures.h"
int sample,
@@ -45,8 +44,7 @@ __kernel void kernel_ocl_path_trace(
kg->data = data;
#define KERNEL_TEX(type, ttype, name) \
kg->name = name; \
kg->name##_width = name##_width;
kg->name = name;
#include "kernel_textures.h"
int x = sx + get_global_id(0);
@@ -62,8 +60,7 @@ __kernel void kernel_ocl_tonemap(
__global float4 *buffer,
#define KERNEL_TEX(type, ttype, name) \
__global type *name, \
int name##_width,
__global type *name,
#include "kernel_textures.h"
int sample, int resolution,
@@ -74,8 +71,7 @@ __kernel void kernel_ocl_tonemap(
kg->data = data;
#define KERNEL_TEX(type, ttype, name) \
kg->name = name; \
kg->name##_width = name##_width;
kg->name = name;
#include "kernel_textures.h"
int x = sx + get_global_id(0);