wine-commits June 2016

wine-commits@winehq.org

2 participants
592 discussions

Alistair Leslie-Hughes : d3dcompiler_34: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 5980690b7060d094cc5296361675f679a49a7db4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5980690b7060d094cc5296361… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:33 2016 +0000 d3dcompiler_34: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_34/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_34/d3dcompiler_34.spec | 18 ++++++------- dlls/d3dcompiler_34/d3dcompiler_34_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_34/Makefile.in b/dlls/d3dcompiler_34/Makefile.in index f520488..c717fe5 100644 --- a/dlls/d3dcompiler_34/Makefile.in +++ b/dlls/d3dcompiler_34/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_34.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=34 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_34_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_34/d3dcompiler_34.spec b/dlls/d3dcompiler_34/d3dcompiler_34.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_34/d3dcompiler_34.spec +++ b/dlls/d3dcompiler_34/d3dcompiler_34.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_34/d3dcompiler_34_main.c b/dlls/d3dcompiler_34/d3dcompiler_34_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_34/d3dcompiler_34_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index a2d6696..9b48b16 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_34", "d3dcompiler_33", ], [

1 0

Alistair Leslie-Hughes : d3dcompiler_35: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 6fe46a605fe9c8f9c033b83a8e3b0bb6358b964c URL: http://source.winehq.org/git/wine.git/?a=commit;h=6fe46a605fe9c8f9c033b83a8… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:21 2016 +0000 d3dcompiler_35: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_35/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_35/d3dcompiler_35.spec | 18 ++++++------- dlls/d3dcompiler_35/d3dcompiler_35_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_35/Makefile.in b/dlls/d3dcompiler_35/Makefile.in index c122486..8db0e52 100644 --- a/dlls/d3dcompiler_35/Makefile.in +++ b/dlls/d3dcompiler_35/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_35.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=35 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_35_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_35/d3dcompiler_35.spec b/dlls/d3dcompiler_35/d3dcompiler_35.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_35/d3dcompiler_35.spec +++ b/dlls/d3dcompiler_35/d3dcompiler_35.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_35/d3dcompiler_35_main.c b/dlls/d3dcompiler_35/d3dcompiler_35_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_35/d3dcompiler_35_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index f630664..a2d6696 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_35", "d3dcompiler_34", "d3dcompiler_33", ],

1 0

Alistair Leslie-Hughes : d3dcompiler_36: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 008644bef8083a63ed707996e289bc986d004d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=008644bef8083a63ed707996e… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:03:10 2016 +0000 d3dcompiler_36: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_36/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_36/d3dcompiler_36.spec | 18 ++++++------- dlls/d3dcompiler_36/d3dcompiler_36_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_36/Makefile.in b/dlls/d3dcompiler_36/Makefile.in index 89aec41..41ec544 100644 --- a/dlls/d3dcompiler_36/Makefile.in +++ b/dlls/d3dcompiler_36/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_36.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=36 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_36_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_36/d3dcompiler_36.spec b/dlls/d3dcompiler_36/d3dcompiler_36.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_36/d3dcompiler_36.spec +++ b/dlls/d3dcompiler_36/d3dcompiler_36.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_36/d3dcompiler_36_main.c b/dlls/d3dcompiler_36/d3dcompiler_36_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_36/d3dcompiler_36_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 6c8ff20..f630664 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_36", "d3dcompiler_35", "d3dcompiler_34", "d3dcompiler_33",

1 0

Alistair Leslie-Hughes : d3dcompiler_37: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: c769a29aef3fb40e2d24d4ecaae68b429517cdd6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c769a29aef3fb40e2d24d4eca… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:58 2016 +0000 d3dcompiler_37: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_37/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_37/d3dcompiler_37.spec | 18 ++++++------- dlls/d3dcompiler_37/d3dcompiler_37_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_37/Makefile.in b/dlls/d3dcompiler_37/Makefile.in index 42a9b32..4fb97c4 100644 --- a/dlls/d3dcompiler_37/Makefile.in +++ b/dlls/d3dcompiler_37/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_37.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=37 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_37_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_37/d3dcompiler_37.spec b/dlls/d3dcompiler_37/d3dcompiler_37.spec index 5e20e1a..907ca73 100644 --- a/dlls/d3dcompiler_37/d3dcompiler_37.spec +++ b/dlls/d3dcompiler_37/d3dcompiler_37.spec @@ -1,10 +1,10 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub DebugSetMute diff --git a/dlls/d3dcompiler_37/d3dcompiler_37_main.c b/dlls/d3dcompiler_37/d3dcompiler_37_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_37/d3dcompiler_37_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 8a0b3fb..6c8ff20 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_37", "d3dcompiler_36", "d3dcompiler_35", "d3dcompiler_34",

1 0

Alistair Leslie-Hughes : d3dcompiler_38: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: ce43c4e751340c098a540a707ffde3766f73cdbd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce43c4e751340c098a540a707… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Fri Jun 17 15:49:21 2016 +0200 d3dcompiler_38: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_38/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_38/d3dcompiler_38.spec | 18 ++++++------- dlls/d3dcompiler_38/d3dcompiler_38_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_38/Makefile.in b/dlls/d3dcompiler_38/Makefile.in index 71dba82..c7a19bf 100644 --- a/dlls/d3dcompiler_38/Makefile.in +++ b/dlls/d3dcompiler_38/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_38.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=38 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_38_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_38/d3dcompiler_38.spec b/dlls/d3dcompiler_38/d3dcompiler_38.spec index 9214bc1..66047b2 100644 --- a/dlls/d3dcompiler_38/d3dcompiler_38.spec +++ b/dlls/d3dcompiler_38/d3dcompiler_38.spec @@ -1,11 +1,11 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub D3DReturnFailure1 @ stub DebugSetMute diff --git a/dlls/d3dcompiler_38/d3dcompiler_38_main.c b/dlls/d3dcompiler_38/d3dcompiler_38_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_38/d3dcompiler_38_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 1a34be8..8a0b3fb 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_38", "d3dcompiler_37", "d3dcompiler_36", "d3dcompiler_35",

1 0

Alistair Leslie-Hughes : d3dcompiler_39: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 27ab2cf439d260a08723ad8cb7fdbe1f944109fd URL: http://source.winehq.org/git/wine.git/?a=commit;h=27ab2cf439d260a08723ad8cb… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:34 2016 +0000 d3dcompiler_39: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_39/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_39/d3dcompiler_39.spec | 18 ++++++------- dlls/d3dcompiler_39/d3dcompiler_39_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 28 insertions(+), 53 deletions(-) diff --git a/dlls/d3dcompiler_39/Makefile.in b/dlls/d3dcompiler_39/Makefile.in index fdd4a67..22433d7 100644 --- a/dlls/d3dcompiler_39/Makefile.in +++ b/dlls/d3dcompiler_39/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_39.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=39 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_39_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_39/d3dcompiler_39.spec b/dlls/d3dcompiler_39/d3dcompiler_39.spec index 9214bc1..66047b2 100644 --- a/dlls/d3dcompiler_39/d3dcompiler_39.spec +++ b/dlls/d3dcompiler_39/d3dcompiler_39.spec @@ -1,11 +1,11 @@ -@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassembleCode(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ stdcall D3DDisassembleEffect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DGetCodeDebugInfo(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 D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflectCode(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompileFromMemory(ptr long str ptr ptr str str long long ptr ptr) D3DCompile +@ stdcall D3DDisassembleCode(ptr long long ptr ptr) D3DDisassemble +@ stub D3DDisassembleEffect(ptr long ptr) +@ stdcall D3DGetCodeDebugInfo(ptr long ptr) D3DGetDebugInfo +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocessFromMemory(ptr long str ptr ptr ptr ptr) D3DPreprocess +@ stdcall D3DReflectCode(ptr long ptr ptr) D3DReflect @ stub D3DReturnFailure1 @ stub DebugSetMute diff --git a/dlls/d3dcompiler_39/d3dcompiler_39_main.c b/dlls/d3dcompiler_39/d3dcompiler_39_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_39/d3dcompiler_39_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index ab0289f..1a34be8 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_39", "d3dcompiler_38", "d3dcompiler_37", "d3dcompiler_36",

1 0

Alistair Leslie-Hughes : d3dcompiler_40: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 775b78e6b06fa8f0e4e4f39dacff4f4ba308c2b4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=775b78e6b06fa8f0e4e4f39da… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:24 2016 +0000 d3dcompiler_40: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_40/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_40/d3dcompiler_40.spec | 20 +++++++-------- dlls/d3dcompiler_40/d3dcompiler_40_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 29 insertions(+), 54 deletions(-) diff --git a/dlls/d3dcompiler_40/Makefile.in b/dlls/d3dcompiler_40/Makefile.in index 744d95e..c74a6a7 100644 --- a/dlls/d3dcompiler_40/Makefile.in +++ b/dlls/d3dcompiler_40/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_40.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=40 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_40_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_40/d3dcompiler_40.spec b/dlls/d3dcompiler_40/d3dcompiler_40.spec index 858600e..b85c5fb 100644 --- a/dlls/d3dcompiler_40/d3dcompiler_40.spec +++ b/dlls/d3dcompiler_40/d3dcompiler_40.spec @@ -1,12 +1,12 @@ @ stub DebugSetMute -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ 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 D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stdcall D3DDisassemble(ptr long long ptr ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_40/d3dcompiler_40_main.c b/dlls/d3dcompiler_40/d3dcompiler_40_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_40/d3dcompiler_40_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index cb60f6a..ab0289f 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_40", "d3dcompiler_39", "d3dcompiler_38", "d3dcompiler_37",

1 0

Alistair Leslie-Hughes : d3dcompiler_41: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: f78af7218dae89c2af82afd6dea95bccecbf2478 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f78af7218dae89c2af82afd6d… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:02:11 2016 +0000 d3dcompiler_41: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_41/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_41/d3dcompiler_41.spec | 22 ++++++++-------- dlls/d3dcompiler_41/d3dcompiler_41_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_41/Makefile.in b/dlls/d3dcompiler_41/Makefile.in index 7a8f38e..e004bb7 100644 --- a/dlls/d3dcompiler_41/Makefile.in +++ b/dlls/d3dcompiler_41/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_41.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=41 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_41_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_41/d3dcompiler_41.spec b/dlls/d3dcompiler_41/d3dcompiler_41.spec index 84adee3..e5127bc 100644 --- a/dlls/d3dcompiler_41/d3dcompiler_41.spec +++ b/dlls/d3dcompiler_41/d3dcompiler_41.spec @@ -1,13 +1,13 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stub DebugSetMute -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ 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 D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stdcall D3DDisassemble(ptr long long ptr ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_41/d3dcompiler_41_main.c b/dlls/d3dcompiler_41/d3dcompiler_41_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_41/d3dcompiler_41_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 4fe71b0..cb60f6a 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_41", "d3dcompiler_40", "d3dcompiler_39", "d3dcompiler_38",

1 0

Alistair Leslie-Hughes : d3dcompiler_42: Share source with d3dcompiler_43.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: b52cd87a4c396338c57311afa75fa57646e679a6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b52cd87a4c396338c57311afa… Author: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Date: Thu Jun 16 08:01:59 2016 +0000 d3dcompiler_42: Share source with d3dcompiler_43. Signed-off-by: Alistair Leslie-Hughes <leslie_alistair(a)hotmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dcompiler_42/Makefile.in | 20 ++++++++++++++- dlls/d3dcompiler_42/d3dcompiler_42.spec | 22 ++++++++-------- dlls/d3dcompiler_42/d3dcompiler_42_main.c | 42 ------------------------------- tools/make_specfiles | 1 - 4 files changed, 30 insertions(+), 55 deletions(-) diff --git a/dlls/d3dcompiler_42/Makefile.in b/dlls/d3dcompiler_42/Makefile.in index 1095384..d30aad9 100644 --- a/dlls/d3dcompiler_42/Makefile.in +++ b/dlls/d3dcompiler_42/Makefile.in @@ -1,6 +1,24 @@ MODULE = d3dcompiler_42.dll +IMPORTS = dxguid uuid +EXTRALIBS = -lwpp +EXTRADEFS = -DD3D_COMPILER_VERSION=42 +PARENTSRC = ../d3dcompiler_43 C_SRCS = \ - d3dcompiler_42_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_42/d3dcompiler_42.spec b/dlls/d3dcompiler_42/d3dcompiler_42.spec index 84adee3..e5127bc 100644 --- a/dlls/d3dcompiler_42/d3dcompiler_42.spec +++ b/dlls/d3dcompiler_42/d3dcompiler_42.spec @@ -1,13 +1,13 @@ -@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) d3dcompiler_43.D3DAssemble +@ stdcall D3DAssemble(ptr long str ptr ptr long ptr ptr) @ stub DebugSetMute -@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) d3dcompiler_43.D3DCompile -@ stdcall D3DDisassemble10Effect(ptr long ptr) d3dcompiler_43.D3DDisassemble10Effect -@ stdcall D3DDisassemble(ptr long long ptr ptr) d3dcompiler_43.D3DDisassemble -@ 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 D3DPreprocess(ptr long str ptr ptr ptr ptr) d3dcompiler_43.D3DPreprocess -@ stdcall D3DReflect(ptr long ptr ptr) d3dcompiler_43.D3DReflect +@ stdcall D3DCompile(ptr long str ptr ptr str str long long ptr ptr) +@ stub D3DDisassemble10Effect(ptr long ptr) +@ stdcall D3DDisassemble(ptr long long ptr ptr) +@ stdcall D3DGetDebugInfo(ptr long ptr) +@ stdcall D3DGetInputAndOutputSignatureBlob(ptr long ptr) +@ stdcall D3DGetInputSignatureBlob(ptr long ptr) +@ stdcall D3DGetOutputSignatureBlob(ptr long ptr) +@ stdcall D3DPreprocess(ptr long str ptr ptr ptr ptr) +@ stdcall D3DReflect(ptr long ptr ptr) @ stub D3DReturnFailure1 -@ stdcall D3DStripShader(ptr long long ptr) d3dcompiler_43.D3DStripShader +@ stdcall D3DStripShader(ptr long long ptr) diff --git a/dlls/d3dcompiler_42/d3dcompiler_42_main.c b/dlls/d3dcompiler_42/d3dcompiler_42_main.c deleted file mode 100644 index 4453ead..0000000 --- a/dlls/d3dcompiler_42/d3dcompiler_42_main.c +++ /dev/null @@ -1,42 +0,0 @@ -/* - * Direct3D shader compiler main file - * - * Copyright 2010 Matteo Bruni for CodeWeavers - * - * 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 hinstDLL, DWORD fdwReason, LPVOID lpvReserved) -{ - switch (fdwReason) - { - case DLL_WINE_PREATTACH: - return FALSE; /* prefer native version */ - case DLL_PROCESS_ATTACH: - DisableThreadLibraryCalls(hinstDLL); - break; - } - - return TRUE; -} diff --git a/tools/make_specfiles b/tools/make_specfiles index 448d813..4fe71b0 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -111,7 +111,6 @@ my @dll_groups = "d3dcompiler_43", "d3dcompiler_47", "d3dcompiler_46", - "d3dcompiler_42", "d3dcompiler_41", "d3dcompiler_40", "d3dcompiler_39",

1 0

Józef Kucia : wined3d: Recognize SM5 ld_uav_typed opcode.
by Alexandre Julliard 17 Jun '16

17 Jun '16

Module: wine Branch: master Commit: 36dcae193d856512aefec7e7b295c57cd2861bd5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=36dcae193d856512aefec7e7b… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri Jun 17 10:41:49 2016 +0200 wined3d: Recognize SM5 ld_uav_typed opcode. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/arb_program_shader.c | 1 + dlls/wined3d/glsl_shader.c | 1 + dlls/wined3d/shader.c | 1 + dlls/wined3d/shader_sm4.c | 2 ++ dlls/wined3d/wined3d_private.h | 1 + 5 files changed, 6 insertions(+) diff --git a/dlls/wined3d/arb_program_shader.c b/dlls/wined3d/arb_program_shader.c index 35fa23f..6810b21 100644 --- a/dlls/wined3d/arb_program_shader.c +++ b/dlls/wined3d/arb_program_shader.c @@ -5307,6 +5307,7 @@ static const SHADER_HANDLER shader_arb_instruction_handler_table[WINED3DSIH_TABL /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, + /* WINED3DSIH_LD_UAV_TYPED */ NULL, /* WINED3DSIH_LIT */ shader_hw_map2gl, /* WINED3DSIH_LOG */ shader_hw_scalar_op, /* WINED3DSIH_LOGP */ shader_hw_scalar_op, diff --git a/dlls/wined3d/glsl_shader.c b/dlls/wined3d/glsl_shader.c index dfcf5cf..cf4f72c 100644 --- a/dlls/wined3d/glsl_shader.c +++ b/dlls/wined3d/glsl_shader.c @@ -8641,6 +8641,7 @@ static const SHADER_HANDLER shader_glsl_instruction_handler_table[WINED3DSIH_TAB /* WINED3DSIH_LD2DMS */ NULL, /* WINED3DSIH_LD_RAW */ NULL, /* WINED3DSIH_LD_STRUCTURED */ NULL, + /* WINED3DSIH_LD_UAV_TYPED */ NULL, /* WINED3DSIH_LIT */ shader_glsl_lit, /* WINED3DSIH_LOG */ shader_glsl_scalar_op, /* WINED3DSIH_LOGP */ shader_glsl_scalar_op, diff --git a/dlls/wined3d/shader.c b/dlls/wined3d/shader.c index b8adca1..33c6280 100644 --- a/dlls/wined3d/shader.c +++ b/dlls/wined3d/shader.c @@ -139,6 +139,7 @@ static const char * const shader_opcode_names[] = /* WINED3DSIH_LD2DMS */ "ld2dms", /* WINED3DSIH_LD_RAW */ "ld_raw", /* WINED3DSIH_LD_STRUCTURED */ "ld_structured", + /* WINED3DSIH_LD_UAV_TYPED */ "ld_uav_typed", /* WINED3DSIH_LIT */ "lit", /* WINED3DSIH_LOG */ "log", /* WINED3DSIH_LOGP */ "logp", diff --git a/dlls/wined3d/shader_sm4.c b/dlls/wined3d/shader_sm4.c index 6793883..18d345b 100644 --- a/dlls/wined3d/shader_sm4.c +++ b/dlls/wined3d/shader_sm4.c @@ -221,6 +221,7 @@ enum wined3d_sm4_opcode WINED3D_SM5_OP_DCL_HS_FORK_PHASE_INSTANCE_COUNT = 0x99, WINED3D_SM5_OP_DCL_UAV_TYPED = 0x9c, WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED = 0xa2, + WINED3D_SM5_OP_LD_UAV_TYPED = 0xa3, WINED3D_SM5_OP_STORE_UAV_TYPED = 0xa4, WINED3D_SM5_OP_LD_RAW = 0xa5, WINED3D_SM5_OP_STORE_RAW = 0xa6, @@ -773,6 +774,7 @@ static const struct wined3d_sm4_opcode_info opcode_table[] = shader_sm4_read_dcl_resource}, {WINED3D_SM5_OP_DCL_RESOURCE_STRUCTURED, WINED3DSIH_DCL_RESOURCE_STRUCTURED, "", "", shader_sm5_read_dcl_resource_structured}, + {WINED3D_SM5_OP_LD_UAV_TYPED, WINED3DSIH_LD_UAV_TYPED, "u", "iU"}, {WINED3D_SM5_OP_STORE_UAV_TYPED, WINED3DSIH_STORE_UAV_TYPED, "U", "iu"}, {WINED3D_SM5_OP_LD_RAW, WINED3DSIH_LD_RAW, "u", "iU"}, {WINED3D_SM5_OP_STORE_RAW, WINED3DSIH_STORE_RAW, "U", "iu"}, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 2669275..04dd160 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -647,6 +647,7 @@ enum WINED3D_SHADER_INSTRUCTION_HANDLER WINED3DSIH_LD2DMS, WINED3DSIH_LD_RAW, WINED3DSIH_LD_STRUCTURED, + WINED3DSIH_LD_UAV_TYPED, WINED3DSIH_LIT, WINED3DSIH_LOG, WINED3DSIH_LOGP,

1 0

← Newer
1
...
14
15
16
17
18
19
20
...
60
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits June 2016