diff --git a/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch b/patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch index 7c4c5b9a..848308ea 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 8ed5305238bf910faaa3943ee179767e8d5d3c84 Mon Sep 17 00:00:00 2001 +From 2cda99ddf587014177b89227e5e13763d0e58ae6 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: nvcuda: First implementation. (rev 2) @@ -9,14 +9,14 @@ Changes by Sebastian Lackner : * Do not unlock the critical section while processing TLS callbacks --- configure.ac | 1 + - dlls/nvcuda/Makefile.in | 3 +- + dlls/nvcuda/Makefile.in | 1 + dlls/nvcuda/internal.c | 515 ++++++++++ dlls/nvcuda/nvcuda.c | 2097 ++++++++++++++++++++++++++++++++++++++++- 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, 3057 insertions(+), 252 deletions(-) + 8 files changed, 3056 insertions(+), 251 deletions(-) create mode 100644 dlls/nvcuda/internal.c create mode 100644 dlls/nvcuda/nvcuda.h create mode 100644 dlls/nvcuda/tests/Makefile.in @@ -35,21 +35,20 @@ index 1e38434..8a98996 100644 WINE_CONFIG_DLL(odbc32,,[implib]) WINE_CONFIG_DLL(odbccp32,,[implib]) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in -index 4b33278..6322fb2 100644 +index 4b33278c115..0921ce64cae 100644 --- a/dlls/nvcuda/Makefile.in +++ b/dlls/nvcuda/Makefile.in @@ -1,6 +1,7 @@ MODULE = nvcuda.dll C_SRCS = \ -- nvcuda.c -+ nvcuda.c \ -+ internal.c ++ internal.c \ + nvcuda.c RC_SRCS = nvcuda.rc diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c new file mode 100644 -index 0000000..611e310 +index 00000000000..611e3108d0b --- /dev/null +++ b/dlls/nvcuda/internal.c @@ -0,0 +1,515 @@ @@ -569,7 +568,7 @@ index 0000000..611e310 + return CUDA_ERROR_UNKNOWN; +} diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 8b7eb9c..3ef7c35 100644 +index 8b7eb9c37b0..3ef7c35059d 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -1,4 +1,5 @@ @@ -2691,7 +2690,7 @@ index 8b7eb9c..3ef7c35 100644 diff --git a/dlls/nvcuda/nvcuda.h b/dlls/nvcuda/nvcuda.h new file mode 100644 -index 0000000..aaffe13 +index 00000000000..aaffe13af5f --- /dev/null +++ b/dlls/nvcuda/nvcuda.h @@ -0,0 +1,29 @@ @@ -2725,7 +2724,7 @@ index 0000000..aaffe13 + +#endif diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec -index 279f7ab..621b8d5 100644 +index 279f7ab803b..621b8d59cf0 100644 --- a/dlls/nvcuda/nvcuda.spec +++ b/dlls/nvcuda/nvcuda.spec @@ -1,36 +1,36 @@ @@ -3239,7 +3238,7 @@ index 279f7ab..621b8d5 100644 @ stub cuWGLGetDevice diff --git a/dlls/nvcuda/tests/Makefile.in b/dlls/nvcuda/tests/Makefile.in new file mode 100644 -index 0000000..81f9290 +index 00000000000..81f9290e5aa --- /dev/null +++ b/dlls/nvcuda/tests/Makefile.in @@ -0,0 +1,4 @@ @@ -3249,7 +3248,7 @@ index 0000000..81f9290 + nvcuda.c diff --git a/dlls/nvcuda/tests/nvcuda.c b/dlls/nvcuda/tests/nvcuda.c new file mode 100644 -index 0000000..fc8f300 +index 00000000000..fc8f300a28b --- /dev/null +++ b/dlls/nvcuda/tests/nvcuda.c @@ -0,0 +1,168 @@ @@ -3422,5 +3421,5 @@ index 0000000..fc8f300 + test_TlsNotifyInterface(); +} -- -2.4.0 +2.11.0 diff --git a/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch b/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch index c444334c..af4db274 100644 --- a/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch +++ b/patches/nvcuda-CUDA_Support/0007-nvcuda-Properly-wrap-stream-callbacks-by-forwarding-.patch @@ -1,4 +1,4 @@ -From 4cb6fdc37124222d6e661d8db89fc832f98da9cb Mon Sep 17 00:00:00 2001 +From 0d393cfac6d2d4908f40a09565eab989bc71dfab Mon Sep 17 00:00:00 2001 From: Sebastian Lackner Date: Thu, 22 Jan 2015 01:02:53 +0100 Subject: nvcuda: Properly wrap stream callbacks by forwarding them to a worker @@ -10,7 +10,7 @@ Subject: nvcuda: Properly wrap stream callbacks by forwarding them to a worker 2 files changed, 122 insertions(+), 15 deletions(-) diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in -index 6322fb2..98541b1 100644 +index 0921ce64cae..ab8a5a29a7a 100644 --- a/dlls/nvcuda/Makefile.in +++ b/dlls/nvcuda/Makefile.in @@ -1,4 +1,5 @@ @@ -18,9 +18,9 @@ index 6322fb2..98541b1 100644 +EXTRALIBS = $(PTHREAD_LIBS) C_SRCS = \ - nvcuda.c \ + internal.c \ diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c -index 9fefc28..8b356fd 100644 +index 9fefc28fa76..8b356fd6f5d 100644 --- a/dlls/nvcuda/nvcuda.c +++ b/dlls/nvcuda/nvcuda.c @@ -21,11 +21,17 @@ @@ -205,5 +205,5 @@ index 9fefc28..8b356fd 100644 } -- -2.2.1 +2.11.0