[Bf-blender-cvs] [18883d2fd13] cycles-x: Cycles X: Remove unused pointer alignment query
Sergey Sharybin
noreply at git.blender.org
Mon May 17 18:15:50 CEST 2021
Commit: 18883d2fd1398e7f4a8ccb60155b1572a9646ba5
Author: Sergey Sharybin
Date: Mon May 17 18:15:00 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB18883d2fd1398e7f4a8ccb60155b1572a9646ba5
Cycles X: Remove unused pointer alignment query
Was used by NLM denoiser.
Removing to make it easier to possibly extend to the new devices.
Reviewed By: brecht
Differential Revision: https://developer.blender.org/D11275
===================================================================
M intern/cycles/device/device.h
M intern/cycles/device/opencl/device_impl.cpp
M intern/cycles/device/opencl/device_impl.h
M intern/cycles/device/opencl/util.cpp
===================================================================
diff --git a/intern/cycles/device/device.h b/intern/cycles/device/device.h
index 7b616cb64e1..c3e165255a6 100644
--- a/intern/cycles/device/device.h
+++ b/intern/cycles/device/device.h
@@ -319,12 +319,6 @@ class Device {
Stats &stats;
Profiler &profiler;
- /* memory alignment */
- virtual int mem_sub_ptr_alignment()
- {
- return MIN_ALIGNMENT_CPU_DATA_TYPES;
- }
-
/* constant memory */
virtual void const_copy_to(const char *name, void *host, size_t size) = 0;
diff --git a/intern/cycles/device/opencl/device_impl.cpp b/intern/cycles/device/opencl/device_impl.cpp
index b9f9c51a5f1..89777b78d65 100644
--- a/intern/cycles/device/opencl/device_impl.cpp
+++ b/intern/cycles/device/opencl/device_impl.cpp
@@ -1083,11 +1083,6 @@ void OpenCLDevice::mem_free(device_memory &mem)
}
}
-int OpenCLDevice::mem_sub_ptr_alignment()
-{
- return OpenCLInfo::mem_sub_ptr_alignment(cdDevice);
-}
-
device_ptr OpenCLDevice::mem_alloc_sub_ptr(device_memory &mem, int offset, int size)
{
cl_mem_flags mem_flag;
diff --git a/intern/cycles/device/opencl/device_impl.h b/intern/cycles/device/opencl/device_impl.h
index 6eec90ae2f7..f9426cad1e9 100644
--- a/intern/cycles/device/opencl/device_impl.h
+++ b/intern/cycles/device/opencl/device_impl.h
@@ -141,8 +141,6 @@ class OpenCLInfo {
int *minor,
cl_int *error = NULL);
- static int mem_sub_ptr_alignment(cl_device_id device_id);
-
/* Get somewhat more readable device name.
* Main difference is AMD OpenCL here which only gives code name
* for the regular device name. This will give more sane device
@@ -431,7 +429,6 @@ class OpenCLDevice : public Device {
void mem_zero(device_memory &mem);
void mem_free(device_memory &mem);
- int mem_sub_ptr_alignment();
void const_copy_to(const char *name, void *host, size_t size);
void global_alloc(device_memory &mem);
diff --git a/intern/cycles/device/opencl/util.cpp b/intern/cycles/device/opencl/util.cpp
index 70783f20edd..4df774a96ab 100644
--- a/intern/cycles/device/opencl/util.cpp
+++ b/intern/cycles/device/opencl/util.cpp
@@ -1309,17 +1309,6 @@ bool OpenCLInfo::get_driver_version(cl_device_id device_id, int *major, int *min
return true;
}
-int OpenCLInfo::mem_sub_ptr_alignment(cl_device_id device_id)
-{
- int base_align_bits;
- if (clGetDeviceInfo(
- device_id, CL_DEVICE_MEM_BASE_ADDR_ALIGN, sizeof(int), &base_align_bits, NULL) ==
- CL_SUCCESS) {
- return base_align_bits / 8;
- }
- return 1;
-}
-
CCL_NAMESPACE_END
#endif
More information about the Bf-blender-cvs
mailing list