Rebase against 3852d3357d087353d71d4d11359014a97dbf3e5a.

[d3dx9_36-D3DXDisassembleShader]
Removed patch to implement stub for d3dx9_36.D3DXFillCubeTextureTX (fixed upstream).
This commit is contained in:
Sebastian Lackner
2016-08-06 01:56:00 +02:00
parent eaf5582379
commit d95ae10e5a
50 changed files with 1124 additions and 1727 deletions

View File

@@ -1,4 +1,4 @@
From 204794b8da1f17308574230feee919c28f065c2e Mon Sep 17 00:00:00 2001
From 18084b4d4ce50242019c9493e64497fc153a58dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 19 Aug 2014 22:47:51 +0200
Subject: dxgi: Improve stubs for MakeWindowAssociation and
@@ -10,10 +10,10 @@ Subject: dxgi: Improve stubs for MakeWindowAssociation and
2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/dlls/dxgi/dxgi_private.h b/dlls/dxgi/dxgi_private.h
index 129f6b4..1b3f49d 100644
index 987370f1..a1b3392 100644
--- a/dlls/dxgi/dxgi_private.h
+++ b/dlls/dxgi/dxgi_private.h
@@ -102,6 +102,7 @@ struct dxgi_factory
@@ -109,6 +109,7 @@ struct dxgi_factory
struct wined3d *wined3d;
BOOL extended;
HWND device_window;
@@ -22,7 +22,7 @@ index 129f6b4..1b3f49d 100644
HRESULT dxgi_factory_create(REFIID riid, void **factory, BOOL extended) DECLSPEC_HIDDEN;
diff --git a/dlls/dxgi/factory.c b/dlls/dxgi/factory.c
index 1af7f72..2ec85e3 100644
index d54eea9..662b0cf 100644
--- a/dlls/dxgi/factory.c
+++ b/dlls/dxgi/factory.c
@@ -168,16 +168,28 @@ static HRESULT STDMETHODCALLTYPE dxgi_factory_EnumAdapters(IDXGIFactory1 *iface,
@@ -54,7 +54,7 @@ index 1af7f72..2ec85e3 100644
+ return S_OK;
}
static UINT dxgi_rational_to_uint(const DXGI_RATIONAL *rational)
static HRESULT STDMETHODCALLTYPE dxgi_factory_CreateSwapChain(IDXGIFactory1 *iface,
--
2.7.1
2.9.0