RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

vo_gpu: d3d11: check for NULL backbuffer in start_frame 

In a lost device scenario, resize() will fail and p->backbuffer will be
NULL. We can't recover from lost devices yet, but we should still check
for a NULL backbuffer in start_frame() rather than crashing.

Also remove a NULL check for p->swapchain. This was a red herring, since
p->swapchain never becomes NULL in an error condition, but p->backbuffer
actually does.

This should fix the crash in #5320, but it doesn't fix the underlying
reason for the lost device (which is probably a driver bug.)
This commit is contained in:
James Ross-Gowan 2018-01-04 22:58:12 +11:00
parent baa18f76ca
commit a9a4d6349a
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
video/out/d3d11/context.c
View File

@ -73,8 +73,6 @@ struct priv {
static struct mp_image *d3d11_screenshot(struct ra_swapchain *sw)
{
struct priv *p = sw->ctx->priv;
if (!p->swapchain)
return NULL;
return mp_d3d11_screenshot(p->swapchain);
}
@ -131,6 +129,10 @@ static int d3d11_color_depth(struct ra_swapchain *sw)
static bool d3d11_start_frame(struct ra_swapchain *sw, struct ra_fbo *out_fbo)
{
struct priv *p = sw->priv;
if (!p->backbuffer)
return false;
*out_fbo = (struct ra_fbo) {
.tex = p->backbuffer,
.flip = false,
@ -226,6 +228,8 @@ static bool d3d11_init(struct ra_ctx *ctx)
goto error;
p->backbuffer = get_backbuffer(ctx);
if (!p->backbuffer)
goto error;
return true;