From 083746bc4811944dcc25c5b6589d7df1bc95eb02 Mon Sep 17 00:00:00 2001 From: Jan Vesely Date: Sun, 28 Aug 2016 04:08:15 -0400 Subject: [PATCH] clover: Use device cap to query pointer size instead of hardcoded 32bits Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=97513 Signed-off-by: Jan Vesely Reviewed-by: Francisco Jerez --- src/gallium/state_trackers/clover/api/device.cpp | 2 +- src/gallium/state_trackers/clover/core/device.cpp | 6 ++++++ src/gallium/state_trackers/clover/core/device.hpp | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/clover/api/device.cpp b/src/gallium/state_trackers/clover/api/device.cpp index 11f21e94eae..f7bd61b929b 100644 --- a/src/gallium/state_trackers/clover/api/device.cpp +++ b/src/gallium/state_trackers/clover/api/device.cpp @@ -158,7 +158,7 @@ clGetDeviceInfo(cl_device_id d_dev, cl_device_info param, break; case CL_DEVICE_ADDRESS_BITS: - buf.as_scalar() = 32; + buf.as_scalar() = dev.address_bits(); break; case CL_DEVICE_MAX_READ_IMAGE_ARGS: diff --git a/src/gallium/state_trackers/clover/core/device.cpp b/src/gallium/state_trackers/clover/core/device.cpp index 39f39f436c6..8825f993a75 100644 --- a/src/gallium/state_trackers/clover/core/device.cpp +++ b/src/gallium/state_trackers/clover/core/device.cpp @@ -193,6 +193,12 @@ device::subgroup_size() const { PIPE_COMPUTE_CAP_SUBGROUP_SIZE)[0]; } +cl_uint +device::address_bits() const { + return get_compute_param(pipe, ir_format(), + PIPE_COMPUTE_CAP_ADDRESS_BITS)[0]; +} + std::string device::device_name() const { return pipe->get_name(pipe); diff --git a/src/gallium/state_trackers/clover/core/device.hpp b/src/gallium/state_trackers/clover/core/device.hpp index 285784744f3..6cf6c7fcb24 100644 --- a/src/gallium/state_trackers/clover/core/device.hpp +++ b/src/gallium/state_trackers/clover/core/device.hpp @@ -68,6 +68,7 @@ namespace clover { std::vector max_block_size() const; cl_uint subgroup_size() const; + cl_uint address_bits() const; std::string device_name() const; std::string vendor_name() const; enum pipe_shader_ir ir_format() const; -- 2.30.2