jp9000
/
obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

libobs-winrt: Fix WGC minimize handling 

Illegal CopySubresourceRegion parameters were sometimes computed when
minimizing and restoring WGC window captures, leading to device loss.

Add robust safeties to ensure that doesn't happen.
master
jpark37 2020-05-10 09:39:06 -07:00
parent 63cbcc5dcc
commit a4c9554739
1 changed files with 54 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

101
libobs-winrt/winrt-capture.cpp
View File

@ -62,11 +62,14 @@ static winrt::com_ptr<T> GetDXGIInterfaceFromObject(
static bool get_client_box(HWND window, uint32_t width, uint32_t height, static bool get_client_box(HWND window, uint32_t width, uint32_t height,
D3D11_BOX *client_box) D3D11_BOX *client_box)
{ {
RECT client_rect, window_rect{}; RECT client_rect{}, window_rect{};
POINT upper_left{}; POINT upper_left{};
const bool client_box_available = /* check iconic (minimized) twice, ABA is very unlikely */
GetClientRect(window, &client_rect) && bool client_box_available =
!IsIconic(window) && GetClientRect(window, &client_rect) &&
!IsIconic(window) && (client_rect.right > 0) &&
(client_rect.bottom > 0) &&
(DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS, (DwmGetWindowAttribute(window, DWMWA_EXTENDED_FRAME_BOUNDS,
&window_rect, &window_rect,
sizeof(window_rect)) == S_OK) && sizeof(window_rect)) == S_OK) &&
@ -100,6 +103,9 @@ static bool get_client_box(HWND window, uint32_t width, uint32_t height,
client_box->front = 0; client_box->front = 0;
client_box->back = 1; client_box->back = 1;
client_box_available = (client_box->right <= width) &&
(client_box->bottom <= height);
} }
return client_box_available; return client_box_available;
@ -131,7 +137,6 @@ struct winrt_capture {
uint32_t texture_width; uint32_t texture_width;
uint32_t texture_height; uint32_t texture_height;
D3D11_BOX client_box; D3D11_BOX client_box;
bool client_box_available;
bool thread_changed; bool thread_changed;
bool active; bool active;
@ -189,10 +194,9 @@ struct winrt_capture {
DestroyIcon(icon); DestroyIcon(icon);
} }
void void on_closed(
on_closed(winrt::Windows::Graphics::Capture::GraphicsCaptureItem const winrt::Windows::Graphics::Capture::GraphicsCaptureItem const &,
&sender, winrt::Windows::Foundation::IInspectable const &)
winrt::Windows::Foundation::IInspectable const &)
{ {
active = FALSE; active = FALSE;
} }
@ -216,50 +220,53 @@ struct winrt_capture {
D3D11_TEXTURE2D_DESC desc; D3D11_TEXTURE2D_DESC desc;
frame_surface->GetDesc(&desc); frame_surface->GetDesc(&desc);
client_box_available = false; if (!client_area || get_client_box(window, desc.Width,
if (client_area) { desc.Height, &client_box)) {
client_box_available = get_client_box( if (client_area) {
window, desc.Width, desc.Height, &client_box); texture_width =
} client_box.right - client_box.left;
texture_height =
if (client_box_available) { client_box.bottom - client_box.top;
texture_width = client_box.right - client_box.left; } else {
texture_height = client_box.bottom - client_box.top; texture_width = desc.Width;
} else { texture_height = desc.Height;
texture_width = desc.Width;
texture_height = desc.Height;
}
if (texture) {
if (texture_width != gs_texture_get_width(texture) ||
texture_height != gs_texture_get_height(texture)) {
gs_texture_destroy(texture);
texture = nullptr;
} }
}
if (!texture) { if (texture) {
texture = gs_texture_create_gdi(texture_width, if (texture_width !=
texture_height); gs_texture_get_width(texture) ||
} texture_height !=
gs_texture_get_height(texture)) {
gs_texture_destroy(texture);
texture = nullptr;
}
}
if (client_box_available) { if (!texture) {
context->CopySubresourceRegion( texture = gs_texture_create_gdi(texture_width,
(ID3D11Texture2D *)gs_texture_get_obj(texture), texture_height);
0, 0, 0, 0, frame_surface.get(), 0, }
&client_box);
} else {
/* if they gave an SRV, we could avoid this copy */
context->CopyResource(
(ID3D11Texture2D *)gs_texture_get_obj(texture),
frame_surface.get());
}
if (capture_cursor && cursor_visible) { if (client_area) {
draw_cursor(); context->CopySubresourceRegion(
} (ID3D11Texture2D *)gs_texture_get_obj(
texture),
0, 0, 0, 0, frame_surface.get(), 0,
&client_box);
} else {
/* if they gave an SRV, we could avoid this copy */
context->CopyResource(
(ID3D11Texture2D *)gs_texture_get_obj(
texture),
frame_surface.get());
}
texture_written = true; if (capture_cursor && cursor_visible) {
draw_cursor();
}
texture_written = true;
}
if (frame_content_size.Width != last_size.Width || if (frame_content_size.Width != last_size.Width ||
frame_content_size.Height != last_size.Height) { frame_content_size.Height != last_size.Height) {