Cycles: OpenCL tweaks

[blender.git] / intern / cycles / kernel / kernel.cl

diff --git a/intern/cycles/kernel/kernel.cl b/intern/cycles/kernel/kernel.cl
index 48bee8eef9725489c2d513e0810c069a48f5441b..68ca24af58e942fe3bd1b55fb2daa9c7f6f6ad39 100644 (file)
--- a/intern/cycles/kernel/kernel.cl
+++ b/intern/cycles/kernel/kernel.cl
@@ -33,8 +33,7 @@ __kernel void kernel_ocl_path_trace(
        __global uint *rng_state,
 
 #define KERNEL_TEX(type, ttype, name) \
        __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,
 #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->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);
 #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 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,
 #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->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);
 #include "kernel_textures.h"
 
        int x = sx + get_global_id(0);