From 1424de0a4af766f400a0fe7447f8e9faf63e2671 Mon Sep 17 00:00:00 2001
From: Seungha Yang <seungha.yang@navercorp.com>
Date: Wed, 18 Dec 2019 20:36:32 +0900
Subject: [PATCH] d3d11window: Don't hold backbuffer interface

We don't need to hold it
---
 sys/d3d11/gstd3d11window.c | 23 +++++++++--------------
 sys/d3d11/gstd3d11window.h |  1 -
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/sys/d3d11/gstd3d11window.c b/sys/d3d11/gstd3d11window.c
index 047656a68c..c06b2f2416 100644
--- a/sys/d3d11/gstd3d11window.c
+++ b/sys/d3d11/gstd3d11window.c
@@ -230,11 +230,6 @@ static void
 gst_d3d11_window_release_resources (GstD3D11Device * device,
     GstD3D11Window * window)
 {
-  if (window->backbuffer) {
-    ID3D11Texture2D_Release (window->backbuffer);
-    window->backbuffer = NULL;
-  }
-
   if (window->rtv) {
     ID3D11RenderTargetView_Release (window->rtv);
     window->rtv = NULL;
@@ -535,17 +530,13 @@ gst_d3d11_window_on_resize (GstD3D11Device * device, GstD3D11Window * window)
   guint width, height;
   D3D11_TEXTURE2D_DESC desc;
   DXGI_SWAP_CHAIN_DESC swap_desc;
+  ID3D11Texture2D *backbuffer;
 
   if (!window->swap_chain)
     return;
 
   d3d11_dev = gst_d3d11_device_get_device_handle (device);
 
-  if (window->backbuffer) {
-    ID3D11Texture2D_Release (window->backbuffer);
-    window->backbuffer = NULL;
-  }
-
   if (window->rtv) {
     ID3D11RenderTargetView_Release (window->rtv);
     window->rtv = NULL;
@@ -561,14 +552,14 @@ gst_d3d11_window_on_resize (GstD3D11Device * device, GstD3D11Window * window)
   }
 
   hr = IDXGISwapChain_GetBuffer (window->swap_chain,
-      0, &IID_ID3D11Texture2D, (void **) &window->backbuffer);
+      0, &IID_ID3D11Texture2D, (void **) &backbuffer);
   if (!gst_d3d11_result (hr)) {
     GST_ERROR_OBJECT (window,
         "Cannot get backbuffer from swapchain, hr: 0x%x", (guint) hr);
     return;
   }
 
-  ID3D11Texture2D_GetDesc (window->backbuffer, &desc);
+  ID3D11Texture2D_GetDesc (backbuffer, &desc);
   window->surface_width = desc.Width;
   window->surface_height = desc.Height;
 
@@ -605,11 +596,12 @@ gst_d3d11_window_on_resize (GstD3D11Device * device, GstD3D11Window * window)
       window->render_rect.w, window->render_rect.h);
 
   hr = ID3D11Device_CreateRenderTargetView (d3d11_dev,
-      (ID3D11Resource *) window->backbuffer, NULL, &window->rtv);
+      (ID3D11Resource *) backbuffer, NULL, &window->rtv);
   if (!gst_d3d11_result (hr)) {
     GST_ERROR_OBJECT (window, "Cannot create render target view, hr: 0x%x",
         (guint) hr);
-    return;
+
+    goto done;
   }
 
   if (window->cached_buffer) {
@@ -622,6 +614,9 @@ gst_d3d11_window_on_resize (GstD3D11Device * device, GstD3D11Window * window)
 
     _present_on_device_thread (window->device, &present_data);
   }
+
+done:
+  ID3D11Texture2D_Release (backbuffer);
 }
 
 static void
diff --git a/sys/d3d11/gstd3d11window.h b/sys/d3d11/gstd3d11window.h
index 496e190c32..6c103d8123 100644
--- a/sys/d3d11/gstd3d11window.h
+++ b/sys/d3d11/gstd3d11window.h
@@ -96,7 +96,6 @@ struct _GstD3D11Window
 
   HDC device_handle;
   IDXGISwapChain *swap_chain;
-  ID3D11Texture2D *backbuffer;
   ID3D11RenderTargetView *rtv;
   DXGI_FORMAT format;