sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

Cycles: Remove ulong usage

Browse Source 
This is a bit confusing, especially when one mixes OpenCL code where ulong equals
to uint64_t with CPU side code where ulong is expected to be something else from
the naming.

This commit makes it so we use explicit name, common on all platforms.
This commit is contained in:
Sergey Sharybin 2017-08-09 13:44:21 +02:00
parent 45d7513f84
commit 176ad9ecdd
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intern/cycles/device/opencl/opencl_split.cpp
View File

@ -119,7 +119,7 @@ public:
typedef struct _tex_info_t {
uint buffer, padding;
ulong offset;
uint64_t offset;
uint width, height, depth, options;
} _tex_info_t;

2
intern/cycles/kernel/kernel_globals.h
View File

@ -119,7 +119,7 @@ typedef type name##_t;
typedef struct tex_info_t {
uint buffer, padding;
ulong offset;
uint64_t offset;
uint width, height, depth, options;
} tex_info_t;

2
intern/cycles/kernel/kernels/opencl/kernel.cl
View File

@ -178,7 +178,7 @@ __kernel void kernel_ocl_convert_to_half_float(
kernel_film_convert_to_half_float(kg, rgba, buffer, sample_scale, x, y, offset, stride);
}
__kernel void kernel_ocl_zero_buffer(ccl_global float4 *buffer, ulong size, ulong offset)
__kernel void kernel_ocl_zero_buffer(ccl_global float4 *buffer, uint64_t size, uint64_t offset)
{
size_t i = ccl_global_id(0) + ccl_global_id(1) * ccl_global_size(0);