Module: wine Branch: master Commit: 0a12011ab60d39eb88eb68bc3f8cfce34d6b0743 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0a12011ab60d39eb88eb68bc3f...
Author: Alistair Leslie-Hughes leslie_alistair@hotmail.com Date: Thu Jun 25 19:46:57 2015 +1000
d3dcompiler: Share the source with d3dcompiler_47.
---
dlls/d3dcompiler_47/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_47/d3dcompiler_47.spec | 24 +++++++++--------- dlls/d3dcompiler_47/d3dcompiler_47_main.c | 42 ------------------------------- 3 files changed, 31 insertions(+), 55 deletions(-)
diff --git a/dlls/d3dcompiler_47/Makefile.in b/dlls/d3dcompiler_47/Makefile.in index 9f6ef8f..cb7f557 100644 --- a/dlls/d3dcompiler_47/Makefile.in +++ b/dlls/d3dcompiler_47/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_47.dll +IMPORTS = dxguid uuid +EXTRALIBS = $(LIBWPP) +EXTRADEFS = -DD3D_COMPILER_VERSION=47 +PARENTSRC = ../d3dcompiler_43
C_SRCS = \ - d3dcompiler_47_main.c + asmparser.c \ + blob.c \ + bytecodewriter.c \ + compiler.c \ + main.c \ + reflection.c \ + utils.c + +LEX_SRCS = \ + asmshader.l \ + hlsl.l + +BISON_SRCS = \ + asmshader.y \ + hlsl.y
RC_SRCS = version.rc diff --git a/dlls/d3dcompiler_47/d3dcompiler_47.spec b/dlls/d3dcompiler_47/d3dcompiler_47.spec index 08bc418..40ad977 100644 --- a/dlls/d3dcompiler_47/d3dcompiler_47.spec +++ b/dlls/d3dcompiler_47/d3dcompiler_47.spec @@ -1,29 +1,29 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) @ stub D3DCompile2 @ stub D3DCompileFromFile @ stub D3DCompressShaders -@ stdcall D3DCreateBlob(long ptr) d3dcompiler_43.D3DCreateBlob +@ stdcall D3DCreateBlob(long ptr) @ stub D3DCreateFunctionLinkingGraph @ stub D3DCreateLinker @ stub D3DDecompressShaders -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble +@ stdcall D3DDisassemble(ptr long long ptr ptr) @ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect @ stub D3DDisassemble11Trace @ stub D3DDisassembleRegion -@ stdcall D3DGetBlobPart(ptr long long long ptr) d3dcompiler_43.D3DGetBlobPart -@ stdcall D3DGetDebugInfo(ptr long ptr) d3dcompiler_43.D3DGetDebugInfo -@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputAndOutputSignatureBlob -@ stdcall D3DGetInputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetInputSignatureBlob -@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) d3dcompiler_43.D3DGetOutputSignatureBlob +@ stdcall D3DGetBlobPart(ptr long long long ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) @ stub D3DGetTraceInstructionOffsets @ stub D3DLoadModule -@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) @ stub D3DReadFileToBlob -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReflectLibrary @ stub D3DReturnFailure1 @ stub D3DSetBlobPart -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) @ stub D3DWriteBlobToFile @ stub DebugSetMute diff --git a/dlls/d3dcompiler_47/d3dcompiler_47_main.c b/dlls/d3dcompiler_47/d3dcompiler_47_main.c deleted file mode 100644 index 320a4e0..0000000 --- a/dlls/d3dcompiler_47/d3dcompiler_47_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2015 Alistair Leslie-Hughes - * - * 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> - -#include "windef.h" -#include "winbase.h" - -BOOL WINAPI DllMain(HINSTANCE instdll, DWORD reason, void *reserved) -{ - switch (reason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(instdll); - break; - } - - return TRUE; -}