nvcuda-CUDA_Support: Don't temporarily prefer native.

patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch

@@ -1,4 +1,4 @@
-From efd5568fb54159ffb5d8af057047aa0ee5b602d6 Mon Sep 17 00:00:00 2001
+From e8be3588a4bb095b180474ebd69e07295549f29e Mon Sep 17 00:00:00 2001
 From: Sebastian Lackner <sebastian@fds-team.de>
 Date: Sat, 3 Jan 2015 03:32:12 +0100
 Subject: [PATCH] nvcuda: Add stub dll.
@@ -6,20 +6,20 @@ Subject: [PATCH] nvcuda: Add stub dll.
 ---
  configure.ac            |   1 +
  dlls/nvcuda/Makefile.in |   6 +
- dlls/nvcuda/nvcuda.c    |  37 +++++
+ dlls/nvcuda/nvcuda.c    |  35 +++++
  dlls/nvcuda/nvcuda.rc   |  33 +++++
  dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++
- 5 files changed, 385 insertions(+)
+ 5 files changed, 383 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 13f971866..2bc340b70 100644
+index caff5d1fe52..f6a8f8d2458 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3543,6 +3543,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe)
+@@ -3557,6 +3557,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,7 +29,7 @@ index 13f971866..2bc340b70 100644
  WINE_CONFIG_MAKEFILE(dlls/odbcbcp)
 diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
 new file mode 100644
-index 000000000..4b33278c1
+index 00000000000..4b33278c115
 --- /dev/null
 +++ b/dlls/nvcuda/Makefile.in
 @@ -0,0 +1,6 @@
@@ -41,10 +41,10 @@ index 000000000..4b33278c1
 +RC_SRCS = nvcuda.rc
 diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
 new file mode 100644
-index 000000000..8b7eb9c37
+index 00000000000..f89ebc9d3e2
 --- /dev/null
 +++ b/dlls/nvcuda/nvcuda.c
-@@ -0,0 +1,37 @@
+@@ -0,0 +1,35 @@
 +/*
 + * Copyright (C) 2014-2015 Sebastian Lackner
 + *
@@ -73,8 +73,6 @@ index 000000000..8b7eb9c37
 +{
 +    switch (reason)
 +    {
-+        case DLL_WINE_PREATTACH:
-+            return FALSE;    /* prefer native version */
 +        case DLL_PROCESS_ATTACH:
 +            DisableThreadLibraryCalls(instance);
 +            break;
@@ -84,7 +82,7 @@ index 000000000..8b7eb9c37
 +}
 diff --git a/dlls/nvcuda/nvcuda.rc b/dlls/nvcuda/nvcuda.rc
 new file mode 100644
-index 000000000..f135e8331
+index 00000000000..f135e83310e
 --- /dev/null
 +++ b/dlls/nvcuda/nvcuda.rc
 @@ -0,0 +1,33 @@
@@ -123,7 +121,7 @@ index 000000000..f135e8331
 +#include "wine/wine_common_ver.rc"
 diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec
 new file mode 100644
-index 000000000..279f7ab80
+index 00000000000..279f7ab803b
 --- /dev/null
 +++ b/dlls/nvcuda/nvcuda.spec
 @@ -0,0 +1,308 @@
@@ -436,5 +434,5 @@ index 000000000..279f7ab80
 +@ stub cuTexRefSetMipmappedArray
 +@ stub cuWGLGetDevice
 -- 
-2.24.0
+2.20.1
 

patches/nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch

@@ -1,4 +1,4 @@
-From b56857593bfce8f684953cd4c3356e78100a7ef5 Mon Sep 17 00:00:00 2001
+From de6fa54bd3abdb58136d378b13a08e809e5b6a10 Mon Sep 17 00:00:00 2001
 From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
 Date: Sat, 3 Jan 2015 03:39:11 +0100
 Subject: [PATCH] nvcuda: First implementation. (rev 2)
@@ -11,22 +11,22 @@ Changes by Sebastian Lackner <sebastian@fds-team.de>:
  configure.ac                  |    1 +
  dlls/nvcuda/Makefile.in       |    1 +
  dlls/nvcuda/internal.c        |  514 ++++++++
- dlls/nvcuda/nvcuda.c          | 2096 ++++++++++++++++++++++++++++++++-
+ dlls/nvcuda/nvcuda.c          | 2094 ++++++++++++++++++++++++++++++++-
  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(+), 251 deletions(-)
+ 8 files changed, 3054 insertions(+), 249 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 7fd6ce83974..7dd3db6bb9f 100644
+index f6a8f8d2458..67f4376f9aa 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -3602,6 +3602,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
+@@ -3558,6 +3558,7 @@ WINE_CONFIG_MAKEFILE(dlls/ntoskrnl.exe/tests)
  WINE_CONFIG_MAKEFILE(dlls/ntprint)
  WINE_CONFIG_MAKEFILE(dlls/ntprint/tests)
  WINE_CONFIG_MAKEFILE(dlls/nvcuda)
@@ -567,7 +567,7 @@ index 00000000000..664bdf84f51
 +    return CUDA_ERROR_UNKNOWN;
 +}
 diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
-index 8b7eb9c37b0..623c9f3c87a 100644
+index f89ebc9d3e2..623c9f3c87a 100644
 --- a/dlls/nvcuda/nvcuda.c
 +++ b/dlls/nvcuda/nvcuda.c
 @@ -1,4 +1,5 @@
@@ -576,7 +576,7 @@ index 8b7eb9c37b0..623c9f3c87a 100644
   * Copyright (C) 2014-2015 Sebastian Lackner
   *
   * This library is free software; you can redistribute it and/or
-@@ -17,19 +18,2104 @@
+@@ -17,17 +18,2104 @@
   */
  
  #include "config.h"
@@ -2670,8 +2670,6 @@ index 8b7eb9c37b0..623c9f3c87a 100644
 +
      switch (reason)
      {
--        case DLL_WINE_PREATTACH:
--            return FALSE;    /* prefer native version */
          case DLL_PROCESS_ATTACH:
 -            DisableThreadLibraryCalls(instance);
 +            if (!load_functions()) return FALSE;
@@ -3419,5 +3417,5 @@ index 00000000000..fc8f300a28b
 +    test_TlsNotifyInterface();
 +}
 -- 
-2.28.0
+2.20.1