fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-11 01:30:25 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/nine: Improve Surface GetContainer

Browse source 
Prevents a crash in wine tests. Not sure
this behaviour is the correct one, but at
least it'll check the IID passed is the device
before returning it.

Signed-off-by: Axel Davy <davyaxel0@gmail.com>
Acked-by: Timur Kristóf <timur.kristof@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10160>
This commit is contained in:
Axel Davy 2021-03-12 15:07:45 +01:00 • committed by Marge Bot
parent 17dc334b81
commit d03f401fda
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/gallium/frontends/nine/surface9.c
View file

@ -339,15 +339,10 @@ NineSurface9_GetContainer( struct NineSurface9 *This,
if (!ppContainer) return E_POINTER;
/* Return device for OffscreenPlainSurface, DepthStencilSurface and RenderTarget */
if (!NineUnknown(This)->container) {
*ppContainer = NineUnknown(This)->device;
NineUnknown_AddRef(NineUnknown(*ppContainer));
return D3D_OK;
}
hr = NineUnknown_QueryInterface(NineUnknown(This)->container, riid, ppContainer);
/* Use device for OffscreenPlainSurface, DepthStencilSurface and RenderTarget */
hr = NineUnknown_QueryInterface(NineUnknown(This)->container ?
NineUnknown(This)->container : &NineUnknown(This)->device->base,
riid, ppContainer);
if (FAILED(hr))
DBG("QueryInterface FAILED!\n");
return hr;