aboutsummaryrefslogtreecommitdiff
path: root/src/platform/graphics/direct2d
diff options
context:
space:
mode:
Diffstat (limited to 'src/platform/graphics/direct2d')
-rw-r--r--src/platform/graphics/direct2d/Brush.cpp2
-rw-r--r--src/platform/graphics/direct2d/Factory.cpp18
-rw-r--r--src/platform/graphics/direct2d/Font.cpp6
-rw-r--r--src/platform/graphics/direct2d/Geometry.cpp18
-rw-r--r--src/platform/graphics/direct2d/Image.cpp4
-rw-r--r--src/platform/graphics/direct2d/ImageFactory.cpp42
-rw-r--r--src/platform/graphics/direct2d/Painter.cpp4
-rw-r--r--src/platform/graphics/direct2d/TextLayout.cpp20
-rw-r--r--src/platform/graphics/direct2d/WindowRenderTarget.cpp10
9 files changed, 62 insertions, 62 deletions
diff --git a/src/platform/graphics/direct2d/Brush.cpp b/src/platform/graphics/direct2d/Brush.cpp
index 7ab35273..c067ed89 100644
--- a/src/platform/graphics/direct2d/Brush.cpp
+++ b/src/platform/graphics/direct2d/Brush.cpp
@@ -4,7 +4,7 @@
namespace cru::platform::graphics::direct2d {
D2DSolidColorBrush::D2DSolidColorBrush(DirectGraphicsFactory* factory)
: DirectGraphicsResource(factory) {
- ThrowIfFailed(factory->GetDefaultD2D1DeviceContext()->CreateSolidColorBrush(
+ CheckHResult(factory->GetDefaultD2D1DeviceContext()->CreateSolidColorBrush(
Convert(color_), &brush_));
}
diff --git a/src/platform/graphics/direct2d/Factory.cpp b/src/platform/graphics/direct2d/Factory.cpp
index 414ef2ab..6be4f797 100644
--- a/src/platform/graphics/direct2d/Factory.cpp
+++ b/src/platform/graphics/direct2d/Factory.cpp
@@ -27,33 +27,33 @@ DirectGraphicsFactory::DirectGraphicsFactory() : DirectGraphicsResource(this) {
Microsoft::WRL::ComPtr<ID3D11DeviceContext> d3d11_device_context;
- ThrowIfFailed(D3D11CreateDevice(
+ CheckHResult(D3D11CreateDevice(
nullptr, D3D_DRIVER_TYPE_HARDWARE, nullptr, creation_flags,
feature_levels, ARRAYSIZE(feature_levels), D3D11_SDK_VERSION,
&d3d11_device_, nullptr, &d3d11_device_context));
Microsoft::WRL::ComPtr<IDXGIDevice> dxgi_device;
- ThrowIfFailed(d3d11_device_->QueryInterface(dxgi_device.GetAddressOf()));
+ CheckHResult(d3d11_device_->QueryInterface(dxgi_device.GetAddressOf()));
- ThrowIfFailed(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED,
+ CheckHResult(D2D1CreateFactory(D2D1_FACTORY_TYPE_SINGLE_THREADED,
IID_PPV_ARGS(&d2d1_factory_)));
- ThrowIfFailed(d2d1_factory_->CreateDevice(dxgi_device.Get(), &d2d1_device_));
+ CheckHResult(d2d1_factory_->CreateDevice(dxgi_device.Get(), &d2d1_device_));
d2d1_device_context_ = CreateD2D1DeviceContext();
// Identify the physical adapter (GPU or card) this device is runs on.
Microsoft::WRL::ComPtr<IDXGIAdapter> dxgi_adapter;
- ThrowIfFailed(dxgi_device->GetAdapter(&dxgi_adapter));
+ CheckHResult(dxgi_device->GetAdapter(&dxgi_adapter));
// Get the factory object that created the DXGI device.
- ThrowIfFailed(dxgi_adapter->GetParent(IID_PPV_ARGS(&dxgi_factory_)));
+ CheckHResult(dxgi_adapter->GetParent(IID_PPV_ARGS(&dxgi_factory_)));
- ThrowIfFailed(DWriteCreateFactory(
+ CheckHResult(DWriteCreateFactory(
DWRITE_FACTORY_TYPE_SHARED, __uuidof(IDWriteFactory),
reinterpret_cast<IUnknown**>(dwrite_factory_.GetAddressOf())));
- ThrowIfFailed(dwrite_factory_->GetSystemFontCollection(
+ CheckHResult(dwrite_factory_->GetSystemFontCollection(
&dwrite_system_font_collection_));
image_factory_ = std::make_unique<WinImageFactory>(this);
@@ -64,7 +64,7 @@ DirectGraphicsFactory::~DirectGraphicsFactory() {}
Microsoft::WRL::ComPtr<ID2D1DeviceContext1>
DirectGraphicsFactory::CreateD2D1DeviceContext() {
Microsoft::WRL::ComPtr<ID2D1DeviceContext1> d2d1_device_context;
- ThrowIfFailed(d2d1_device_->CreateDeviceContext(
+ CheckHResult(d2d1_device_->CreateDeviceContext(
D2D1_DEVICE_CONTEXT_OPTIONS_NONE, &d2d1_device_context));
return d2d1_device_context;
}
diff --git a/src/platform/graphics/direct2d/Font.cpp b/src/platform/graphics/direct2d/Font.cpp
index 50f7c266..18a4a2c7 100644
--- a/src/platform/graphics/direct2d/Font.cpp
+++ b/src/platform/graphics/direct2d/Font.cpp
@@ -16,13 +16,13 @@ DWriteFont::DWriteFont(DirectGraphicsFactory* factory, std::string font_family,
throw platform::win::Win32Error(
::GetLastError(), "Failed to get locale when create dwrite font.");
- ThrowIfFailed(factory->GetDWriteFactory()->CreateTextFormat(
+ CheckHResult(factory->GetDWriteFactory()->CreateTextFormat(
string::ToUtf16(font_family_).c_str(), nullptr, DWRITE_FONT_WEIGHT_NORMAL,
DWRITE_FONT_STYLE_NORMAL, DWRITE_FONT_STRETCH_NORMAL, font_size,
buffer.data(), &text_format_));
- ThrowIfFailed(text_format_->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_LEADING));
- ThrowIfFailed(
+ CheckHResult(text_format_->SetTextAlignment(DWRITE_TEXT_ALIGNMENT_LEADING));
+ CheckHResult(
text_format_->SetParagraphAlignment(DWRITE_PARAGRAPH_ALIGNMENT_NEAR));
}
diff --git a/src/platform/graphics/direct2d/Geometry.cpp b/src/platform/graphics/direct2d/Geometry.cpp
index 89b2cfd9..b4e9fcbf 100644
--- a/src/platform/graphics/direct2d/Geometry.cpp
+++ b/src/platform/graphics/direct2d/Geometry.cpp
@@ -7,8 +7,8 @@
namespace cru::platform::graphics::direct2d {
D2DGeometryBuilder::D2DGeometryBuilder(DirectGraphicsFactory* factory)
: DirectGraphicsResource(factory) {
- ThrowIfFailed(factory->GetD2D1Factory()->CreatePathGeometry(&geometry_));
- ThrowIfFailed(geometry_->Open(&geometry_sink_));
+ CheckHResult(factory->GetD2D1Factory()->CreatePathGeometry(&geometry_));
+ CheckHResult(geometry_->Open(&geometry_sink_));
}
void D2DGeometryBuilder::CheckValidation() {
@@ -72,7 +72,7 @@ void D2DGeometryBuilder::CloseFigure(bool close) {
std::unique_ptr<IGeometry> D2DGeometryBuilder::Build() {
CheckValidation();
- ThrowIfFailed(geometry_sink_->Close());
+ CheckHResult(geometry_sink_->Close());
geometry_sink_ = nullptr;
auto geometry =
std::make_unique<D2DGeometry>(GetDirectFactory(), std::move(geometry_));
@@ -86,20 +86,20 @@ D2DGeometry::D2DGeometry(DirectGraphicsFactory* factory,
bool D2DGeometry::FillContains(const Point& point) {
BOOL result;
- ThrowIfFailed(geometry_->FillContainsPoint(
+ CheckHResult(geometry_->FillContainsPoint(
Convert(point), D2D1::Matrix3x2F::Identity(), &result));
return result != 0;
}
Rect D2DGeometry::GetBounds() {
D2D1_RECT_F bounds;
- ThrowIfFailed(geometry_->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds));
+ CheckHResult(geometry_->GetBounds(D2D1::Matrix3x2F::Identity(), &bounds));
return Convert(bounds);
}
std::unique_ptr<IGeometry> D2DGeometry::Transform(const Matrix& matrix) {
Microsoft::WRL::ComPtr<ID2D1TransformedGeometry> d2d1_geometry;
- ThrowIfFailed(GetDirectFactory()->GetD2D1Factory()->CreateTransformedGeometry(
+ CheckHResult(GetDirectFactory()->GetD2D1Factory()->CreateTransformedGeometry(
geometry_.Get(), Convert(matrix), &d2d1_geometry));
return std::make_unique<D2DGeometry>(GetDirectFactory(),
std::move(d2d1_geometry));
@@ -107,11 +107,11 @@ std::unique_ptr<IGeometry> D2DGeometry::Transform(const Matrix& matrix) {
std::unique_ptr<IGeometry> D2DGeometry::CreateStrokeGeometry(float width) {
Microsoft::WRL::ComPtr<ID2D1PathGeometry> d2d1_geometry;
- ThrowIfFailed(
+ CheckHResult(
GetDirectFactory()->GetD2D1Factory()->CreatePathGeometry(&d2d1_geometry));
Microsoft::WRL::ComPtr<ID2D1GeometrySink> d2d1_geometry_sink;
- ThrowIfFailed(d2d1_geometry->Open(&d2d1_geometry_sink));
- ThrowIfFailed(
+ CheckHResult(d2d1_geometry->Open(&d2d1_geometry_sink));
+ CheckHResult(
geometry_->Widen(width, nullptr, nullptr, d2d1_geometry_sink.Get()));
d2d1_geometry_sink->Close();
diff --git a/src/platform/graphics/direct2d/Image.cpp b/src/platform/graphics/direct2d/Image.cpp
index 1c4619b3..ca982796 100644
--- a/src/platform/graphics/direct2d/Image.cpp
+++ b/src/platform/graphics/direct2d/Image.cpp
@@ -19,7 +19,7 @@ float Direct2DImage::GetHeight() { return d2d_bitmap_->GetSize().height; }
std::unique_ptr<IImage> Direct2DImage::CreateWithRect(const Rect& rect) {
auto device_context = GetDirectFactory()->CreateD2D1DeviceContext();
Microsoft::WRL::ComPtr<ID2D1Bitmap1> bitmap;
- ThrowIfFailed(device_context->CreateBitmap(
+ CheckHResult(device_context->CreateBitmap(
D2D1::SizeU(rect.width, rect.height), nullptr, 0,
D2D1::BitmapProperties1(D2D1_BITMAP_OPTIONS_TARGET,
D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM,
@@ -28,7 +28,7 @@ std::unique_ptr<IImage> Direct2DImage::CreateWithRect(const Rect& rect) {
device_context->SetTarget(bitmap.Get());
device_context->BeginDraw();
device_context->DrawBitmap(d2d_bitmap_.Get(), Convert(rect));
- ThrowIfFailed(device_context->EndDraw());
+ CheckHResult(device_context->EndDraw());
return std::make_unique<Direct2DImage>(GetDirectFactory(), std::move(bitmap));
}
diff --git a/src/platform/graphics/direct2d/ImageFactory.cpp b/src/platform/graphics/direct2d/ImageFactory.cpp
index 5e667f48..894f3c22 100644
--- a/src/platform/graphics/direct2d/ImageFactory.cpp
+++ b/src/platform/graphics/direct2d/ImageFactory.cpp
@@ -1,5 +1,5 @@
#include "cru/platform/graphics/direct2d/ImageFactory.h"
-#include "cru/base/platform/win/StreamConvert.h"
+#include "cru/base/platform/win/Stream.h"
#include "cru/platform/graphics/direct2d/Factory.h"
#include "cru/platform/graphics/direct2d/Image.h"
@@ -14,7 +14,7 @@ WinImageFactory::WinImageFactory(DirectGraphicsFactory* graphics_factory)
HRESULT hr =
CoCreateInstance(CLSID_WICImagingFactory, NULL, CLSCTX_INPROC_SERVER,
IID_PPV_ARGS(&wic_imaging_factory_));
- ThrowIfFailed(hr);
+ CheckHResult(hr);
}
WinImageFactory::~WinImageFactory() {}
@@ -25,17 +25,17 @@ std::unique_ptr<IImage> WinImageFactory::DecodeFromStream(io::Stream* stream) {
HRESULT hr;
Microsoft::WRL::ComPtr<IStream> com_stream(
- platform::win::ConvertStreamToComStream(stream));
+ platform::win::ToComStream(stream));
Microsoft::WRL::ComPtr<IWICBitmapDecoder> wic_bitmap_decoder;
hr = wic_imaging_factory_->CreateDecoderFromStream(
com_stream.Get(), NULL, WICDecodeMetadataCacheOnDemand,
&wic_bitmap_decoder);
- ThrowIfFailed(hr);
+ CheckHResult(hr);
Microsoft::WRL::ComPtr<IWICBitmapFrameDecode> wic_bitmap_frame_decode;
hr = wic_bitmap_decoder->GetFrame(0, &wic_bitmap_frame_decode);
- ThrowIfFailed(hr);
+ CheckHResult(hr);
auto d2d_context = graphics_factory->GetDefaultD2D1DeviceContext();
@@ -74,7 +74,7 @@ void WinImageFactory::EncodeToStream(IImage* image, io::Stream* stream,
auto direct_image = CheckPlatform<Direct2DImage>(image, GetPlatformId());
Microsoft::WRL::ComPtr<IStream> com_stream(
- platform::win::ConvertStreamToComStream(stream));
+ platform::win::ToComStream(stream));
auto d2d_bitmap = direct_image->GetD2DBitmap();
auto size = d2d_bitmap->GetPixelSize();
@@ -85,36 +85,36 @@ void WinImageFactory::EncodeToStream(IImage* image, io::Stream* stream,
Ensures(pixel_format.alphaMode == D2D1_ALPHA_MODE_PREMULTIPLIED);
Microsoft::WRL::ComPtr<ID2D1Bitmap1> cpu_bitmap;
- ThrowIfFailed(GetDirectFactory()->GetDefaultD2D1DeviceContext()->CreateBitmap(
+ CheckHResult(GetDirectFactory()->GetDefaultD2D1DeviceContext()->CreateBitmap(
size, nullptr, 0,
D2D1::BitmapProperties1(
D2D1_BITMAP_OPTIONS_CANNOT_DRAW | D2D1_BITMAP_OPTIONS_CPU_READ,
pixel_format, dpi_x, dpi_y),
&cpu_bitmap));
- ThrowIfFailed(cpu_bitmap->CopyFromBitmap(nullptr, d2d_bitmap.Get(), nullptr));
+ CheckHResult(cpu_bitmap->CopyFromBitmap(nullptr, d2d_bitmap.Get(), nullptr));
D2D1_MAPPED_RECT mapped_rect;
- ThrowIfFailed(cpu_bitmap->Map(D2D1_MAP_OPTIONS_READ, &mapped_rect));
+ CheckHResult(cpu_bitmap->Map(D2D1_MAP_OPTIONS_READ, &mapped_rect));
Microsoft::WRL::ComPtr<IWICBitmap> wic_bitmap;
- ThrowIfFailed(wic_imaging_factory_->CreateBitmapFromMemory(
+ CheckHResult(wic_imaging_factory_->CreateBitmapFromMemory(
size.width, size.height, GUID_WICPixelFormat32bppPBGRA, mapped_rect.pitch,
mapped_rect.pitch * size.height, mapped_rect.bits, &wic_bitmap));
- ThrowIfFailed(cpu_bitmap->Unmap());
+ CheckHResult(cpu_bitmap->Unmap());
Microsoft::WRL::ComPtr<IWICBitmapEncoder> wic_bitmap_encoder;
- ThrowIfFailed(wic_imaging_factory_->CreateEncoder(
+ CheckHResult(wic_imaging_factory_->CreateEncoder(
ConvertImageFormatToGUID(format), nullptr, &wic_bitmap_encoder));
- ThrowIfFailed(wic_bitmap_encoder->Initialize(com_stream.Get(),
+ CheckHResult(wic_bitmap_encoder->Initialize(com_stream.Get(),
WICBitmapEncoderNoCache));
Microsoft::WRL::ComPtr<IWICBitmapFrameEncode> wic_bitmap_frame_encode;
Microsoft::WRL::ComPtr<IPropertyBag2> property_bag;
- ThrowIfFailed(wic_bitmap_encoder->CreateNewFrame(&wic_bitmap_frame_encode,
+ CheckHResult(wic_bitmap_encoder->CreateNewFrame(&wic_bitmap_frame_encode,
&property_bag));
if (format == ImageFormat::Jpeg) {
@@ -124,15 +124,15 @@ void WinImageFactory::EncodeToStream(IImage* image, io::Stream* stream,
VariantInit(&varValue);
varValue.vt = VT_R4;
varValue.fltVal = quality;
- ThrowIfFailed(property_bag->Write(1, &option, &varValue));
+ CheckHResult(property_bag->Write(1, &option, &varValue));
}
- ThrowIfFailed(wic_bitmap_frame_encode->Initialize(property_bag.Get()));
- ThrowIfFailed(wic_bitmap_frame_encode->SetResolution(dpi_x, dpi_y));
- ThrowIfFailed(wic_bitmap_frame_encode->WriteSource(wic_bitmap.Get(), NULL));
- ThrowIfFailed(wic_bitmap_frame_encode->Commit());
+ CheckHResult(wic_bitmap_frame_encode->Initialize(property_bag.Get()));
+ CheckHResult(wic_bitmap_frame_encode->SetResolution(dpi_x, dpi_y));
+ CheckHResult(wic_bitmap_frame_encode->WriteSource(wic_bitmap.Get(), NULL));
+ CheckHResult(wic_bitmap_frame_encode->Commit());
- ThrowIfFailed(wic_bitmap_encoder->Commit());
+ CheckHResult(wic_bitmap_encoder->Commit());
}
std::unique_ptr<IImage> WinImageFactory::CreateBitmap(int width, int height) {
@@ -144,7 +144,7 @@ std::unique_ptr<IImage> WinImageFactory::CreateBitmap(int width, int height) {
Microsoft::WRL::ComPtr<ID2D1Bitmap1> bitmap;
auto d2d_context = graphics_factory->GetDefaultD2D1DeviceContext();
- ThrowIfFailed(d2d_context->CreateBitmap(
+ CheckHResult(d2d_context->CreateBitmap(
D2D1::SizeU(width, height), nullptr, 0,
D2D1::BitmapProperties1(D2D1_BITMAP_OPTIONS_TARGET,
D2D1::PixelFormat(DXGI_FORMAT_B8G8R8A8_UNORM,
diff --git a/src/platform/graphics/direct2d/Painter.cpp b/src/platform/graphics/direct2d/Painter.cpp
index 1744a638..79401f6e 100644
--- a/src/platform/graphics/direct2d/Painter.cpp
+++ b/src/platform/graphics/direct2d/Painter.cpp
@@ -133,7 +133,7 @@ void D2DDeviceContextPainter::PushLayer(const Rect& bounds) {
CheckValidation();
Microsoft::WRL::ComPtr<ID2D1Layer> layer;
- ThrowIfFailed(device_context_->CreateLayer(&layer));
+ CheckHResult(device_context_->CreateLayer(&layer));
device_context_->PushLayer(D2D1::LayerParameters(Convert(bounds)),
layer.Get());
@@ -167,7 +167,7 @@ void D2DDeviceContextPainter::PopState() {
void D2DDeviceContextPainter::EndDraw() {
if (is_drawing_) {
is_drawing_ = false;
- ThrowIfFailed(device_context_->EndDraw());
+ CheckHResult(device_context_->EndDraw());
DoEndDraw();
}
}
diff --git a/src/platform/graphics/direct2d/TextLayout.cpp b/src/platform/graphics/direct2d/TextLayout.cpp
index ce584608..d347e0f7 100644
--- a/src/platform/graphics/direct2d/TextLayout.cpp
+++ b/src/platform/graphics/direct2d/TextLayout.cpp
@@ -14,7 +14,7 @@ DWriteTextLayout::DWriteTextLayout(DirectGraphicsFactory* factory,
font_ = CheckPlatform<DWriteFont>(font, GetPlatformId());
utf16_text_ = string::ToUtf16(text_);
- ThrowIfFailed(factory->GetDWriteFactory()->CreateTextLayout(
+ CheckHResult(factory->GetDWriteFactory()->CreateTextLayout(
utf16_text_.c_str(), static_cast<UINT32>(utf16_text_.size()),
font_->GetComInterface(), max_width_, max_height_, &text_layout_));
}
@@ -26,7 +26,7 @@ std::string DWriteTextLayout::GetText() { return text_; }
void DWriteTextLayout::SetText(std::string new_text) {
text_ = std::move(new_text);
utf16_text_ = string::ToUtf16(text_);
- ThrowIfFailed(GetDirectFactory()->GetDWriteFactory()->CreateTextLayout(
+ CheckHResult(GetDirectFactory()->GetDWriteFactory()->CreateTextLayout(
utf16_text_.c_str(), static_cast<UINT32>(utf16_text_.size()),
font_->GetComInterface(), max_width_, max_height_, &text_layout_));
}
@@ -37,7 +37,7 @@ std::shared_ptr<IFont> DWriteTextLayout::GetFont() {
void DWriteTextLayout::SetFont(std::shared_ptr<IFont> font) {
font_ = CheckPlatform<DWriteFont>(font, GetPlatformId());
- ThrowIfFailed(GetDirectFactory()->GetDWriteFactory()->CreateTextLayout(
+ CheckHResult(GetDirectFactory()->GetDWriteFactory()->CreateTextLayout(
reinterpret_cast<const wchar_t*>(text_.c_str()),
static_cast<UINT32>(text_.size()), font_->GetComInterface(), max_width_,
max_height_, &text_layout_));
@@ -45,12 +45,12 @@ void DWriteTextLayout::SetFont(std::shared_ptr<IFont> font) {
void DWriteTextLayout::SetMaxWidth(float max_width) {
max_width_ = max_width;
- ThrowIfFailed(text_layout_->SetMaxWidth(max_width_));
+ CheckHResult(text_layout_->SetMaxWidth(max_width_));
}
void DWriteTextLayout::SetMaxHeight(float max_height) {
max_height_ = max_height;
- ThrowIfFailed(text_layout_->SetMaxHeight(max_height_));
+ CheckHResult(text_layout_->SetMaxHeight(max_height_));
}
bool DWriteTextLayout::IsEditMode() { return edit_mode_; }
@@ -93,7 +93,7 @@ Index DWriteTextLayout::GetLineCount() {
Rect DWriteTextLayout::GetTextBounds(bool includingTrailingSpace) {
DWRITE_TEXT_METRICS metrics;
- ThrowIfFailed(text_layout_->GetMetrics(&metrics));
+ CheckHResult(text_layout_->GetMetrics(&metrics));
return Rect{metrics.left, metrics.top,
includingTrailingSpace ? metrics.widthIncludingTrailingWhitespace
: metrics.width,
@@ -120,13 +120,13 @@ std::vector<Rect> DWriteTextLayout::TextRangeRect(
.Normalize();
DWRITE_TEXT_METRICS text_metrics;
- ThrowIfFailed(text_layout_->GetMetrics(&text_metrics));
+ CheckHResult(text_layout_->GetMetrics(&text_metrics));
const auto metrics_count =
text_metrics.lineCount * text_metrics.maxBidiReorderingDepth;
std::vector<DWRITE_HIT_TEST_METRICS> hit_test_metrics(metrics_count);
UINT32 actual_count;
- ThrowIfFailed(text_layout_->HitTestTextRange(
+ CheckHResult(text_layout_->HitTestTextRange(
static_cast<UINT32>(text_range.position),
static_cast<UINT32>(text_range.count), 0, 0, hit_test_metrics.data(),
metrics_count, &actual_count));
@@ -153,7 +153,7 @@ Rect DWriteTextLayout::TextSinglePoint(Index position, bool trailing) {
DWRITE_HIT_TEST_METRICS metrics;
FLOAT left;
FLOAT top;
- ThrowIfFailed(text_layout_->HitTestTextPosition(static_cast<UINT32>(position),
+ CheckHResult(text_layout_->HitTestTextPosition(static_cast<UINT32>(position),
static_cast<BOOL>(trailing),
&left, &top, &metrics));
return Rect{left, top, 0, GetFont()->GetFontSize()};
@@ -164,7 +164,7 @@ TextHitTestResult DWriteTextLayout::HitTest(const Point& point) {
BOOL inside;
DWRITE_HIT_TEST_METRICS metrics;
- ThrowIfFailed(text_layout_->HitTestPoint(point.x, point.y, &trailing, &inside,
+ CheckHResult(text_layout_->HitTestPoint(point.x, point.y, &trailing, &inside,
&metrics));
TextHitTestResult result;
diff --git a/src/platform/graphics/direct2d/WindowRenderTarget.cpp b/src/platform/graphics/direct2d/WindowRenderTarget.cpp
index 51b6ab22..91d0270b 100644
--- a/src/platform/graphics/direct2d/WindowRenderTarget.cpp
+++ b/src/platform/graphics/direct2d/WindowRenderTarget.cpp
@@ -29,7 +29,7 @@ D2DWindowRenderTarget::D2DWindowRenderTarget(DirectGraphicsFactory* factory,
swap_chain_desc.Flags = 0;
// Get the final swap chain for this window from the DXGI factory.
- ThrowIfFailed(dxgi_factory->CreateSwapChainForHwnd(
+ CheckHResult(dxgi_factory->CreateSwapChainForHwnd(
d3d11_device, hwnd, &swap_chain_desc, nullptr, nullptr,
&dxgi_swap_chain_));
@@ -44,13 +44,13 @@ void D2DWindowRenderTarget::ResizeBuffer(const int width, const int height) {
// In order to resize buffer, we need to untarget the buffer first.
d2d1_device_context_->SetTarget(nullptr);
target_bitmap_ = nullptr;
- ThrowIfFailed(dxgi_swap_chain_->ResizeBuffers(0, width, height,
+ CheckHResult(dxgi_swap_chain_->ResizeBuffers(0, width, height,
DXGI_FORMAT_UNKNOWN, 0));
CreateTargetBitmap();
}
void D2DWindowRenderTarget::Present() {
- ThrowIfFailed(dxgi_swap_chain_->Present(1, 0));
+ CheckHResult(dxgi_swap_chain_->Present(1, 0));
}
void D2DWindowRenderTarget::CreateTargetBitmap() {
@@ -58,7 +58,7 @@ void D2DWindowRenderTarget::CreateTargetBitmap() {
// Direct2D needs the dxgi version of the backbuffer surface pointer.
Microsoft::WRL::ComPtr<IDXGISurface> dxgi_back_buffer;
- ThrowIfFailed(
+ CheckHResult(
dxgi_swap_chain_->GetBuffer(0, IID_PPV_ARGS(&dxgi_back_buffer)));
float dpi_x, dpi_y;
@@ -71,7 +71,7 @@ void D2DWindowRenderTarget::CreateTargetBitmap() {
// Get a D2D surface from the DXGI back buffer to use as the D2D render
// target.
- ThrowIfFailed(d2d1_device_context_->CreateBitmapFromDxgiSurface(
+ CheckHResult(d2d1_device_context_->CreateBitmapFromDxgiSurface(
dxgi_back_buffer.Get(), &bitmap_properties, &target_bitmap_));
d2d1_device_context_->SetTarget(target_bitmap_.Get());
generated by cgit v1.2.3 (git 2.46.0) at 2025-12-23 09:04:36 +0000