diff options
| author | Stefan Werner <stefan.werner@intel.com> | 2022-04-01 20:44:31 +0300 |
|---|---|---|
| committer | Stefan Werner <stefan.werner@intel.com> | 2022-04-01 20:44:31 +0300 |
| commit | 65dcb5ebd3440b096637c47807777fb07d430904 (patch) | |
| tree | 94bb3023dae5190779db3fbbb8a8b3a8bdbee58b /intern/cycles/kernel/device/cuda/compat.h | |
| parent | 9c6dff70c88ddefc5b26f85db3d86ad997409781 (diff) | |
Cycles: Semantically separate 2D and 3D texture objects
Currently there are no functional changes.
Preparing for an upcoming oneAPI integration where such separation
in types is needed.
Diffstat (limited to 'intern/cycles/kernel/device/cuda/compat.h')
| -rw-r--r-- | intern/cycles/kernel/device/cuda/compat.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/intern/cycles/kernel/device/cuda/compat.h b/intern/cycles/kernel/device/cuda/compat.h index b392455c740..51e1381d552 100644 --- a/intern/cycles/kernel/device/cuda/compat.h +++ b/intern/cycles/kernel/device/cuda/compat.h @@ -76,10 +76,11 @@ typedef unsigned long long uint64_t; /* GPU texture objects */ typedef unsigned long long CUtexObject; -typedef CUtexObject ccl_gpu_tex_object; +typedef CUtexObject ccl_gpu_tex_object_2D; +typedef CUtexObject ccl_gpu_tex_object_3D; template<typename T> -ccl_device_forceinline T ccl_gpu_tex_object_read_2D(const ccl_gpu_tex_object texobj, +ccl_device_forceinline T ccl_gpu_tex_object_read_2D(const ccl_gpu_tex_object_2D texobj, const float x, const float y) { @@ -87,7 +88,7 @@ ccl_device_forceinline T ccl_gpu_tex_object_read_2D(const ccl_gpu_tex_object tex } template<typename T> -ccl_device_forceinline T ccl_gpu_tex_object_read_3D(const ccl_gpu_tex_object texobj, +ccl_device_forceinline T ccl_gpu_tex_object_read_3D(const ccl_gpu_tex_object_3D texobj, const float x, const float y, const float z) |