Added OclPlatform class.

src/backend/opencl/opencl.cmake

@@ -11,6 +11,7 @@ if (WITH_OPENCL)
         src/backend/opencl/OclThreads.h
         src/backend/opencl/wrappers/OclError.h
         src/backend/opencl/wrappers/OclLib.h
+        src/backend/opencl/wrappers/OclPlatform.h
        )
 
     set(SOURCES_BACKEND_OPENCL
@@ -21,6 +22,7 @@ if (WITH_OPENCL)
         src/backend/opencl/OclThreads.cpp
         src/backend/opencl/wrappers/OclError.cpp
         src/backend/opencl/wrappers/OclLib.cpp
+        src/backend/opencl/wrappers/OclPlatform.cpp
        )
 else()
     remove_definitions(/DXMRIG_FEATURE_OPENCL)

src/backend/opencl/wrappers/OclPlatform.cpp

@@ -0,0 +1,59 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "backend/opencl/wrappers/OclLib.h"
+#include "backend/opencl/wrappers/OclPlatform.h"
+
+
+std::vector<xmrig::OclPlatform> xmrig::OclPlatform::get()
+{
+    const std::vector<cl_platform_id> platforms = OclLib::getPlatformIDs();
+    std::vector<OclPlatform> out;
+    if (platforms.empty()) {
+        return out;
+    }
+
+    out.reserve(platforms.size());
+
+    for (size_t i = 0; i < platforms.size(); i++) {
+        out.emplace_back(i, platforms[i]);
+    }
+
+    return out;
+}
+
+
+xmrig::String xmrig::OclPlatform::vendor() const
+{
+    constexpr size_t size = 128;
+    char *buf = new char[size]();
+
+    if (OclLib::getPlatformInfo(id(), CL_PLATFORM_VENDOR, size, buf, nullptr) != CL_SUCCESS) {
+        delete [] buf;
+
+        return String();
+    }
+
+    return String(buf);
+}

src/backend/opencl/wrappers/OclPlatform.h

@@ -0,0 +1,63 @@
+/* XMRig
+ * Copyright 2010      Jeff Garzik <jgarzik@pobox.com>
+ * Copyright 2012-2014 pooler      <pooler@litecoinpool.org>
+ * Copyright 2014      Lucas Jones <https://github.com/lucasjones>
+ * Copyright 2014-2016 Wolf9466    <https://github.com/OhGodAPet>
+ * Copyright 2016      Jay D Dee   <jayddee246@gmail.com>
+ * Copyright 2017-2018 XMR-Stak    <https://github.com/fireice-uk>, <https://github.com/psychocrypt>
+ * Copyright 2018-2019 SChernykh   <https://github.com/SChernykh>
+ * Copyright 2016-2019 XMRig       <https://github.com/xmrig>, <support@xmrig.com>
+ *
+ *   This program is free software: you can redistribute it and/or modify
+ *   it under the terms of the GNU General Public License as published by
+ *   the Free Software Foundation, either version 3 of the License, or
+ *   (at your option) any later version.
+ *
+ *   This program is distributed in the hope that it will be useful,
+ *   but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ *   GNU General Public License for more details.
+ *
+ *   You should have received a copy of the GNU General Public License
+ *   along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef XMRIG_OCLPLATFORM_H
+#define XMRIG_OCLPLATFORM_H
+
+
+#include <vector>
+
+
+#include "base/tools/String.h"
+
+
+typedef struct _cl_platform_id *cl_platform_id;
+
+
+namespace xmrig {
+
+
+class OclPlatform
+{
+public:
+    OclPlatform() = default;
+    OclPlatform(size_t index, cl_platform_id id) : m_id(id), m_index(index) {}
+
+    static std::vector<OclPlatform> get();
+
+    inline cl_platform_id id() const { return m_id; }
+    inline size_t index() const      { return m_index; }
+
+    String vendor() const;
+
+private:
+    cl_platform_id m_id = nullptr;
+    size_t m_index      = 0;
+};
+
+
+} // namespace xmrig
+
+
+#endif /* XMRIG_OCLPLATFORM_H */

src/base/kernel/Entry.cpp

@@ -37,6 +37,7 @@
 
 #ifdef XMRIG_FEATURE_OPENCL
 #   include "backend/opencl/wrappers/OclLib.h"
+#   include "backend/opencl/wrappers/OclPlatform.h"
 #endif
 
 #include "base/kernel/Entry.h"
@@ -51,16 +52,9 @@ namespace xmrig {
 #ifdef XMRIG_FEATURE_OPENCL
 static void printPlatforms()
 {
-    std::vector<cl_platform_id> platforms = OclLib::getPlatformIDs();
+    const auto platforms = OclPlatform::get();
-
+    for (const auto &platform : platforms) {
-    char buf[128] = { 0 };
+        printf("#%zu: %s\n", platform.index(), platform.vendor().data());
-
-    for (size_t i = 0; i < platforms.size(); i++) {
-        if (OclLib::getPlatformInfo(platforms[i], CL_PLATFORM_VENDOR, sizeof(buf), buf, nullptr) != CL_SUCCESS) {
-            continue;
-        }
-
-        printf("#%zu: %s\n", i, buf);
     }
 }
 #endif