aboutsummaryrefslogtreecommitdiff
path: root/include/cru/win/graph
diff options
context:
space:
mode:
Diffstat (limited to 'include/cru/win/graph')
-rw-r--r--include/cru/win/graph/direct/exception.hpp35
-rw-r--r--include/cru/win/graph/direct/graph_factory.hpp2
-rw-r--r--include/cru/win/graph/direct/platform_id.hpp13
3 files changed, 10 insertions, 40 deletions
diff --git a/include/cru/win/graph/direct/exception.hpp b/include/cru/win/graph/direct/exception.hpp
index bfa14aaf..8e955825 100644
--- a/include/cru/win/graph/direct/exception.hpp
+++ b/include/cru/win/graph/direct/exception.hpp
@@ -1,36 +1,7 @@
#pragma once
-#include "../../win_pre_config.hpp"
-
-#include "cru/platform/exception.hpp"
-
-#include <stdexcept>
-#include <string_view>
+#include "../../exception.hpp"
namespace cru::platform::graph::win::direct {
-
-class HResultError : public PlatformException {
- public:
- explicit HResultError(HRESULT h_result);
- explicit HResultError(HRESULT h_result,
- const std::string_view& additional_message);
- HResultError(const HResultError& other) = default;
- HResultError(HResultError&& other) = default;
- HResultError& operator=(const HResultError& other) = default;
- HResultError& operator=(HResultError&& other) = default;
- ~HResultError() override = default;
-
- HRESULT GetHResult() const { return h_result_; }
-
- private:
- HRESULT h_result_;
-};
-
-inline void ThrowIfFailed(const HRESULT h_result) {
- if (FAILED(h_result)) throw HResultError(h_result);
-}
-
-inline void ThrowIfFailed(const HRESULT h_result,
- const std::string_view& message) {
- if (FAILED(h_result)) throw HResultError(h_result, message);
-}
+using platform::win::HResultError;
+using platform::win::ThrowIfFailed;
} // namespace cru::platform::graph::win::direct \ No newline at end of file
diff --git a/include/cru/win/graph/direct/graph_factory.hpp b/include/cru/win/graph/direct/graph_factory.hpp
index 841dd104..fb26a7c5 100644
--- a/include/cru/win/graph/direct/graph_factory.hpp
+++ b/include/cru/win/graph/direct/graph_factory.hpp
@@ -10,7 +10,7 @@
#include "cru/platform/graph/graph_factory.hpp"
namespace cru::platform::graph::win::direct {
-class DirectGraphFactory : public GraphFactory, IDirectFactory {
+class DirectGraphFactory : public GraphFactory, public IDirectFactory {
friend GraphFactory* GraphFactory::CreateInstance();
public:
diff --git a/include/cru/win/graph/direct/platform_id.hpp b/include/cru/win/graph/direct/platform_id.hpp
index ff02eb27..edac38f1 100644
--- a/include/cru/win/graph/direct/platform_id.hpp
+++ b/include/cru/win/graph/direct/platform_id.hpp
@@ -1,19 +1,18 @@
#pragma once
#include <cru/platform/native_resource.hpp>
-#include <stdexcept>
#include <string_view>
namespace cru::platform::graph::win::direct {
-constexpr std::wstring_view platform_id = L"Windows Direct";
+constexpr std::wstring_view win_direct_platform_id = L"Windows Direct";
-bool IsDirectResource(NativeResource* resource) {
- return resource->GetPlatformId() == platform_id;
+inline bool IsDirectResource(NativeResource* resource) {
+ return resource->GetPlatformId() == win_direct_platform_id;
}
} // namespace cru::platform::graph::win::direct
-#define CRU_PLATFORMID_IMPLEMENT_DIRECT \
- std::wstring_view GetPlatformId() const override { \
- return ::cru::platform::graph::win::direct::platform_id; \
+#define CRU_PLATFORMID_IMPLEMENT_DIRECT \
+ std::wstring_view GetPlatformId() const override { \
+ return ::cru::platform::graph::win::direct::win_direct_platform_id; \
}