ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

d3dx11_42: Share source with d3dx11_43. 

Signed-off-by: Andrey Gusev <andrey.goosev@gmail.com>
Signed-off-by: Matteo Bruni <mbruni@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Andrey Gusev 2019-01-31 15:07:15 +02:00 committed by Alexandre Julliard
parent 2dc1c967d5
commit 1d8a2ba4f7
6 changed files with 16 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dlls/d3dx11_42/Makefile.in
View File

@ -1,10 +1,11 @@
EXTRADEFS = -DD3DX11_SDK_VERSION=42
MODULE = d3dx11_42.dll
IMPORTS = d3dcompiler
PARENTSRC = ../d3dx11_43
C_SRCS = \
async.c \
d3dx11_42.c \
main.c \
texture.c
RC_SRCS = version.rc

55
dlls/d3dx11_42/d3dx11_42.c
View File

@ -1,55 +0,0 @@
/*
* Copyright 2013 Detlef Riekenberg
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
*
*/
#include "config.h"
#include "wine/port.h"
#include <stdarg.h>
#define COBJMACROS
#include "windef.h"
#include "winbase.h"
#include "winuser.h"
#include "objbase.h"
#include "d3dx11.h"
BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
{
switch (reason)
{
case DLL_WINE_PREATTACH:
return FALSE; /* prefer native version */
case DLL_PROCESS_ATTACH:
DisableThreadLibraryCalls(hdll);
}
return TRUE;
}
/***********************************************************************
* D3DX11CheckVersion
*
* Checks whether we are compiling against the correct d3d and d3dx library.
*/
BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
{
if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 42))
return TRUE;
return FALSE;
}

20
dlls/d3dx11_42/d3dx11_42.spec
View File

@ -6,30 +6,30 @@
@ stub D3DX11CompileFromResourceW
@ stub D3DX11ComputeNormalMap
@ stub D3DX11CreateAsyncCompilerProcessor
@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderA
@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr) d3dx11_43.D3DX11CreateAsyncFileLoaderW
@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr) d3dx11_43.D3DX11CreateAsyncMemoryLoader
@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderA
@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr) d3dx11_43.D3DX11CreateAsyncResourceLoaderW
@ stdcall D3DX11CreateAsyncFileLoaderA(str ptr)
@ stdcall D3DX11CreateAsyncFileLoaderW(wstr ptr)
@ stdcall D3DX11CreateAsyncMemoryLoader(ptr long ptr)
@ stdcall D3DX11CreateAsyncResourceLoaderA(long str ptr)
@ stdcall D3DX11CreateAsyncResourceLoaderW(long wstr ptr)
@ stub D3DX11CreateAsyncShaderPreprocessProcessor
@ stub D3DX11CreateAsyncShaderResourceViewProcessor
@ stub D3DX11CreateAsyncTextureInfoProcessor
@ stub D3DX11CreateAsyncTextureProcessor
@ stub D3DX11CreateShaderResourceViewFromFileA
@ stub D3DX11CreateShaderResourceViewFromFileW
@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr) d3dx11_43.D3DX11CreateShaderResourceViewFromMemory
@ stdcall D3DX11CreateShaderResourceViewFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateShaderResourceViewFromResourceA
@ stub D3DX11CreateShaderResourceViewFromResourceW
@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileA
@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr) d3dx11_43.D3DX11CreateTextureFromFileW
@ stdcall D3DX11CreateTextureFromFileA(ptr str ptr ptr ptr ptr)
@ stdcall D3DX11CreateTextureFromFileW(ptr wstr ptr ptr ptr ptr)
@ stdcall D3DX11CreateTextureFromMemory(ptr ptr long ptr ptr ptr ptr)
@ stub D3DX11CreateTextureFromResourceA
@ stub D3DX11CreateTextureFromResourceW
@ stub D3DX11CreateThreadPump
@ stdcall D3DX11FilterTexture(ptr ptr long long) d3dx11_43.D3DX11FilterTexture
@ stdcall D3DX11FilterTexture(ptr ptr long long)
@ stub D3DX11GetImageInfoFromFileA
@ stub D3DX11GetImageInfoFromFileW
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr) d3dx11_43.D3DX11GetImageInfoFromMemory
@ stdcall D3DX11GetImageInfoFromMemory(ptr long ptr ptr ptr)
@ stub D3DX11GetImageInfoFromResourceA
@ stub D3DX11GetImageInfoFromResourceW
@ stub D3DX11LoadTextureFromTexture

3
dlls/d3dx11_43/Makefile.in
View File

@ -1,10 +1,11 @@
EXTRADEFS = -DD3DX11_SDK_VERSION=43
MODULE = d3dx11_43.dll
IMPORTLIB = d3dx11
IMPORTS = d3dcompiler
C_SRCS = \
async.c \
d3dx11_43.c \
main.c \
texture.c
RC_SRCS = version.rc

12
dlls/d3dx11_43/d3dx11_43.c → dlls/d3dx11_43/main.c
View File

@ -48,17 +48,9 @@ BOOL WINAPI DllMain(HINSTANCE hdll, DWORD reason, LPVOID reserved)
return TRUE;
}
/***********************************************************************
* D3DX11CheckVersion
*
* Checks whether we are compiling against the correct d3d and d3dx library.
*/
BOOL WINAPI D3DX11CheckVersion(UINT d3dsdkversion, UINT d3dxsdkversion)
BOOL WINAPI D3DX11CheckVersion(UINT d3d_sdk_ver, UINT d3dx_sdk_ver)
{
if ((d3dsdkversion == D3D11_SDK_VERSION) && (d3dxsdkversion == 43))
return TRUE;
return FALSE;
return d3d_sdk_ver == D3D11_SDK_VERSION && d3dx_sdk_ver == D3DX11_SDK_VERSION;
}
HRESULT WINAPI D3DX11FilterTexture(ID3D11DeviceContext *context, ID3D11Resource *texture, UINT src_level, UINT filter)

4
tools/make_specfiles
View File

@ -91,10 +91,6 @@ my @dll_groups =
"d3dx10_34",
"d3dx10_33",
],
[
"d3dx11_43",
"d3dx11_42",
],
[
"xinput1_3",
"xinput1_4",