summaryrefslogtreecommitdiffstats
path: root/src/gallium
diff options
context:
space:
mode:
authorFrancisco Jerez <currojerez@riseup.net>2013-09-16 21:44:19 -0700
committerFrancisco Jerez <currojerez@riseup.net>2013-10-21 10:47:03 -0700
commitc6e7a0d0d38d415a515f1e2ddcce5583d73d2937 (patch)
treefe43fd746e407d02c7fa501c3a31f582010769bf /src/gallium
parente5fc61fa3f4ef7e00d66003b7f0298f7e20b2cc3 (diff)
clover: Simplify the platform object by using util/range.
Tested-by: Tom Stellard <thomas.stellard@amd.com>
Diffstat (limited to 'src/gallium')
-rw-r--r--src/gallium/state_trackers/clover/core/device.hpp2
-rw-r--r--src/gallium/state_trackers/clover/core/platform.cpp4
-rw-r--r--src/gallium/state_trackers/clover/core/platform.hpp30
3 files changed, 8 insertions, 28 deletions
diff --git a/src/gallium/state_trackers/clover/core/device.hpp b/src/gallium/state_trackers/clover/core/device.hpp
index 95669bdeb64..42e32a19077 100644
--- a/src/gallium/state_trackers/clover/core/device.hpp
+++ b/src/gallium/state_trackers/clover/core/device.hpp
@@ -35,7 +35,7 @@ namespace clover {
class root_resource;
class hard_event;
- class device : public _cl_device_id {
+ class device : public ref_counter, public _cl_device_id {
public:
device(clover::platform &platform, pipe_loader_device *ldev);
device(device &&dev);
diff --git a/src/gallium/state_trackers/clover/core/platform.cpp b/src/gallium/state_trackers/clover/core/platform.cpp
index 31e88307605..e35b1f96da5 100644
--- a/src/gallium/state_trackers/clover/core/platform.cpp
+++ b/src/gallium/state_trackers/clover/core/platform.cpp
@@ -24,7 +24,7 @@
using namespace clover;
-platform::platform() {
+platform::platform() : adaptor_range(derefs(), devs) {
int n = pipe_loader_probe(NULL, 0);
std::vector<pipe_loader_device *> ldevs(n);
@@ -32,7 +32,7 @@ platform::platform() {
for (pipe_loader_device *ldev : ldevs) {
try {
- devs.emplace_back(*this, ldev);
+ devs.push_back(transfer(new device(*this, ldev)));
} catch (error &) {}
}
}
diff --git a/src/gallium/state_trackers/clover/core/platform.hpp b/src/gallium/state_trackers/clover/core/platform.hpp
index 26c65c788bd..83f0cab35e9 100644
--- a/src/gallium/state_trackers/clover/core/platform.hpp
+++ b/src/gallium/state_trackers/clover/core/platform.hpp
@@ -27,37 +27,17 @@
#include "core/object.hpp"
#include "core/device.hpp"
+#include "util/range.hpp"
namespace clover {
- class platform : public _cl_platform_id {
+ class platform : public _cl_platform_id,
+ public adaptor_range<
+ derefs, std::vector<ref_ptr<device>> &> {
public:
- typedef std::vector<device>::iterator iterator;
-
platform();
- ///
- /// Container of all compute devices that are available in the platform.
- ///
- /// @{
- iterator begin() {
- return devs.begin();
- }
-
- iterator end() {
- return devs.end();
- }
-
- device &front() {
- return devs.front();
- }
-
- device &back() {
- return devs.back();
- }
- /// @}
-
protected:
- std::vector<device> devs;
+ std::vector<ref_ptr<device>> devs;
};
}