wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

nvcuda-CUDA_Support: Add semi stub for cuD3D10GetDevice.

Browse Source
This commit is contained in:
Sebastian Lackner 2017-10-02 16:00:52 +02:00
parent 93b9924d3c
commit 76cd811f73
2 changed files with 54 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
patches/nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch Normal file
View File

@ -0,0 +1,52 @@
From 522bff38d261a682e25ad42d36cbc4dff19e7275 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 2 Oct 2017 05:27:55 +0200
Subject: nvcuda: Add semi stub for cuD3D10GetDevice.
---
dlls/nvcuda/nvcuda.c | 8 ++++++++
dlls/nvcuda/nvcuda.spec | 2 +-
2 files changed, 9 insertions(+), 1 deletion(-)
diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
index 99fcacf561e..219567abe1f 100644
--- a/dlls/nvcuda/nvcuda.c
+++ b/dlls/nvcuda/nvcuda.c
@@ -37,6 +37,7 @@
#include "cuda.h"
#include "nvcuda.h"
#include "d3d9.h"
+#include "dxgi.h"
#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
#define DEV_PTR "%llu"
@@ -2958,6 +2959,13 @@ CUresult WINAPI wine_cuD3D9GetDevice(CUdevice *pCudaDevice, const char *pszAdapt
return pcuDeviceGet(pCudaDevice, 0);
}
+CUresult WINAPI wine_cuD3D10GetDevice(CUdevice *pCudaDevice, IDXGIAdapter *pAdapter)
+{
+ FIXME("(%p, %p) - semi-stub\n", pCudaDevice, pAdapter);
+ /* DXGI adapters don't have an OpenGL context assigned yet, otherwise we could use cuGLGetDevices */
+ return pcuDeviceGet(pCudaDevice, 0);
+}
+
BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
{
TRACE("(%p, %u, %p)\n", instance, reason, reserved);
diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec
index 492d6c129c1..4a06881f0b5 100644
--- a/dlls/nvcuda/nvcuda.spec
+++ b/dlls/nvcuda/nvcuda.spec
@@ -34,7 +34,7 @@
@ stub cuD3D10CtxCreate
@ stub cuD3D10CtxCreateOnDevice
@ stub cuD3D10CtxCreate_v2
-@ stub cuD3D10GetDevice
+@ stdcall cuD3D10GetDevice(ptr ptr) wine_cuD3D10GetDevice
@ stub cuD3D10GetDevices
@ stub cuD3D10GetDirect3DDevice
@ stub cuD3D10MapResources
--
2.14.1

2
patches/patchinstall.sh
View File

@ -7144,6 +7144,7 @@ if test "$enable_nvcuda_CUDA_Support" -eq 1; then
patch_apply nvcuda-CUDA_Support/0008-nvcuda-Add-support-for-CUDA-7.0.patch
patch_apply nvcuda-CUDA_Support/0009-nvcuda-Implement-cuModuleLoad-wrapper-function.patch
patch_apply nvcuda-CUDA_Support/0010-nvcuda-Search-for-dylib-library-on-Mac-OS-X.patch
patch_apply nvcuda-CUDA_Support/0011-nvcuda-Add-semi-stub-for-cuD3D10GetDevice.patch
(
printf '%s\n' '+ { "Sebastian Lackner", "include: Add cuda.h.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "nvcuda: Add stub dll.", 1 },';
@ -7155,6 +7156,7 @@ if test "$enable_nvcuda_CUDA_Support" -eq 1; then
printf '%s\n' '+ { "Sebastian Lackner", "nvcuda: Add support for CUDA 7.0.", 1 },';
printf '%s\n' '+ { "Sebastian Lackner", "nvcuda: Implement cuModuleLoad wrapper function.", 1 },';
printf '%s\n' '+ { "Michael Müller", "nvcuda: Search for dylib library on Mac OS X.", 1 },';
printf '%s\n' '+ { "Michael Müller", "nvcuda: Add semi stub for cuD3D10GetDevice.", 1 },';
) >> "$patchlist"
fi