[Bf-blender-cvs] [176ad9ecdd4] master: Cycles: Remove ulong usage

[Sergey Sharybin]

Commit: 176ad9ecdd4efca4dbe33b9c3a003c16e3706433
Author: Sergey Sharybin
Date:   Wed Aug 9 13:44:21 2017 +0200
Branches: master
https://developer.blender.org/rB176ad9ecdd4efca4dbe33b9c3a003c16e3706433

Cycles: Remove ulong usage

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.

===================================================================

M       intern/cycles/device/opencl/opencl_split.cpp
M       intern/cycles/kernel/kernel_globals.h
M       intern/cycles/kernel/kernels/opencl/kernel.cl

===================================================================

diff --git a/intern/cycles/device/opencl/opencl_split.cpp 
b/intern/cycles/device/opencl/opencl_split.cpp
index df7c064a24f..16a96213100 100644
--- a/intern/cycles/device/opencl/opencl_split.cpp
+++ b/intern/cycles/device/opencl/opencl_split.cpp
@@ -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;
 
diff --git a/intern/cycles/kernel/kernel_globals.h 
b/intern/cycles/kernel/kernel_globals.h
index c078f09e1d7..9d55183d94b 100644
--- a/intern/cycles/kernel/kernel_globals.h
+++ b/intern/cycles/kernel/kernel_globals.h
@@ -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;
 
diff --git a/intern/cycles/kernel/kernels/opencl/kernel.cl 
b/intern/cycles/kernel/kernels/opencl/kernel.cl
index 83d63b4fba3..b7108f3d0f8 100644
--- a/intern/cycles/kernel/kernels/opencl/kernel.cl
+++ b/intern/cycles/kernel/kernels/opencl/kernel.cl
@@ -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);

_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs