From b4004c7c8447a6aa6325fad2e4ed9ce1acd41432 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 3 Sep 2022 14:51:37 -0500 Subject: [PATCH] nvcuda-CUDA_Support: Fix a whitespace error. --- .../0002-nvcuda-Add-stub-dll.patch | 18 +++++------- .../0003-nvcuda-First-implementation.patch | 29 +++++++++---------- 2 files changed, 21 insertions(+), 26 deletions(-) diff --git a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch index 4b9bfc4c..a29013ac 100644 --- a/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch +++ b/patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch @@ -1,25 +1,25 @@ -From e8be3588a4bb095b180474ebd69e07295549f29e Mon Sep 17 00:00:00 2001 +From b3f2f6d8a32de3c4db5c9a132e5cf43528e63f4b Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Sat, 3 Jan 2015 03:32:12 +0100 Subject: [PATCH] nvcuda: Add stub dll. --- configure.ac | 1 + - dlls/nvcuda/Makefile.in | 6 + + dlls/nvcuda/Makefile.in | 5 + dlls/nvcuda/nvcuda.c | 35 +++++ dlls/nvcuda/nvcuda.rc | 33 +++++ dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++ - 5 files changed, 383 insertions(+) + 5 files changed, 382 insertions(+) create mode 100644 dlls/nvcuda/Makefile.in create mode 100644 dlls/nvcuda/nvcuda.c create mode 100644 dlls/nvcuda/nvcuda.rc create mode 100644 dlls/nvcuda/nvcuda.spec diff --git a/configure.ac b/configure.ac -index caff5d1fe52..f6a8f8d2458 100644 +index 49d414e1d17..9c2efc4d35e 100644 --- a/configure.ac +++ b/configure.ac -@@ -3557,6 +3557,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) +@@ -2903,6 +2903,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe) WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests) WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) @@ -29,17 +29,15 @@ index caff5d1fe52..f6a8f8d2458 100644 WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in new file mode 100644 -index 00000000000..4b33278c115 +index 00000000000..f80da630710 --- /dev/null +++ b/dlls/nvcuda/Makefile.in -@@ -0,0 +1,6 @@ +@@ -0,0 +1,5 @@ +MODULE = nvcuda.dll +EXTRADLLFLAGS = -mcygwin + +C_SRCS = \ + nvcuda.c -+ -+RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c new file mode 100644 index 00000000000..f89ebc9d3e2 @@ -435,5 +433,5 @@ index 00000000000..279f7ab803b +@ stub cuTexRefSetMipmappedArray +@ stub cuWGLGetDevice -- -2.20.1 +2.35.1 diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 20726af1..3a2f7f46 100644 --- a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch +++ b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch @@ -1,4 +1,4 @@ -From 420c654406ccb66b6876bed02851d7278318cd4e Mon Sep 17 00:00:00 2001 +From 14af6efed4d7b19844b59f246085d86c0f80abfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Michael=20M=C3=BCller?= Date: Sat, 3 Jan 2015 03:39:11 +0100 Subject: [PATCH] nvcuda: First implementation. (rev 2) @@ -11,22 +11,22 @@ Changes by Sebastian Lackner : configure.ac | 1 + dlls/nvcuda/Makefile.in | 1 + dlls/nvcuda/internal.c | 514 ++++++++ - dlls/nvcuda/nvcuda.c | 2094 ++++++++++++++++++++++++++++++++- + dlls/nvcuda/nvcuda.c | 2090 ++++++++++++++++++++++++++++++++- dlls/nvcuda/nvcuda.h | 29 + dlls/nvcuda/nvcuda.spec | 492 ++++---- dlls/nvcuda/tests/Makefile.in | 4 + dlls/nvcuda/tests/nvcuda.c | 168 +++ - 8 files changed, 3054 insertions(+), 249 deletions(-) + 8 files changed, 3052 insertions(+), 247 deletions(-) create mode 100644 dlls/nvcuda/internal.c create mode 100644 dlls/nvcuda/nvcuda.h create mode 100644 dlls/nvcuda/tests/Makefile.in create mode 100644 dlls/nvcuda/tests/nvcuda.c diff --git a/configure.ac b/configure.ac -index 341ed704730..6a3bdc6a89b 100644 +index 9c2efc4d35e..2cfdaad2360 100644 --- a/configure.ac +++ b/configure.ac -@@ -3564,6 +3564,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests) +@@ -2904,6 +2904,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests) WINE_CONFIG_MAKEFILE(dlls/ntprint) WINE_CONFIG_MAKEFILE(dlls/ntprint/tests) WINE_CONFIG_MAKEFILE(dlls/nvcuda) @@ -35,19 +35,18 @@ index 341ed704730..6a3bdc6a89b 100644 WINE_CONFIG_MAKEFILE(dlls/odbc32) WINE_CONFIG_MAKEFILE(dlls/odbcbcp) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in -index f8bea7210cc..20a66c90afb 100644 +index f80da630710..814c9df2ecd 100644 --- a/dlls/nvcuda/Makefile.in +++ b/dlls/nvcuda/Makefile.in -@@ -2,5 +2,6 @@ MODULE = nvcuda.dll +@@ -2,4 +2,5 @@ MODULE = nvcuda.dll EXTRADLLFLAGS = -mcygwin C_SRCS = \ + internal.c \ nvcuda.c - diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c new file mode 100644 -index 00000000000..664bdf84f51 +index 00000000000..16b939aae20 --- /dev/null +++ b/dlls/nvcuda/internal.c @@ -0,0 +1,514 @@ @@ -566,7 +565,7 @@ index 00000000000..664bdf84f51 + return CUDA_ERROR_UNKNOWN; +} diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index f89ebc9d3e2..623c9f3c87a 100644 +index f89ebc9d3e2..c76ec2b6a48 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -1,4 +1,5 @@ @@ -583,10 +582,8 @@ index f89ebc9d3e2..623c9f3c87a 100644 + #include --#include "windef.h" --#include "winbase.h" -+#include "windef.h" -+#include "winbase.h" + #include "windef.h" + #include "winbase.h" +#include "wine/debug.h" +#include "wine/wgl.h" +#include "cuda.h" @@ -3243,7 +3240,7 @@ index 00000000000..81f9290e5aa + nvcuda.c diff --git a/dlls/nvcuda/tests/nvcuda.c b/dlls/nvcuda/tests/nvcuda.c new file mode 100644 -index 00000000000..fc8f300a28b +index 00000000000..e6fad8acca5 --- /dev/null +++ b/dlls/nvcuda/tests/nvcuda.c @@ -0,0 +1,168 @@ @@ -3416,5 +3413,5 @@ index 00000000000..fc8f300a28b + test_TlsNotifyInterface(); +} -- -2.33.0 +2.35.1