You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-04-13 14:42:51 -07:00
nvcuda-CUDA_Support: Add minimalistic cuda.h directly to wine to avoid dependency, split patchset.
This commit is contained in:
Sebastian Lackner
@@ -1396,14 +1396,19 @@ ntoskrnl-Write_CR4.ok:
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * configure.ac, dlls/nvcuda/Makefile.in, dlls/nvcuda/internal.c, dlls/nvcuda/nvcuda.c, dlls/nvcuda/nvcuda.h,
|
||||
# | dlls/nvcuda/nvcuda.rc, dlls/nvcuda/nvcuda.spec, dlls/nvcuda/tests/Makefile.in, dlls/nvcuda/tests/nvcuda.c
|
||||
# | dlls/nvcuda/nvcuda.rc, dlls/nvcuda/nvcuda.spec, dlls/nvcuda/tests/Makefile.in, dlls/nvcuda/tests/nvcuda.c,
|
||||
# | include/Makefile.in, include/cuda.h
|
||||
# |
|
||||
.INTERMEDIATE: nvcuda-CUDA_Support.ok
|
||||
nvcuda-CUDA_Support.ok:
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0001-nvcuda-First-implementation.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0002-nvcuda-Add-Unknown5-internal-interface.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0003-nvcuda-Emulate-two-d3d9-initialization-functions.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0001-include-Add-cuda.h.h.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0003-nvcuda-First-implementation.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0004-nvcuda-Add-Unknown5-internal-interface.patch)
|
||||
$(call APPLY_FILE,nvcuda-CUDA_Support/0005-nvcuda-Emulate-two-d3d9-initialization-functions.patch)
|
||||
@( \
|
||||
echo '+ { "Sebastian Lackner", "include: Add cuda.h.h.", 1 },'; \
|
||||
echo '+ { "Sebastian Lackner", "nvcuda: Add stub dll.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "nvcuda: First implementation.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "nvcuda: Add Unknown5 internal interface.", 1 },'; \
|
||||
echo '+ { "Michael Müller", "nvcuda: Emulate two d3d9 initialization functions.", 1 },'; \
|
||||
|
||||
125
patches/nvcuda-CUDA_Support/0001-include-Add-cuda.h.h.patch
Normal file
125
patches/nvcuda-CUDA_Support/0001-include-Add-cuda.h.h.patch
Normal file
@@ -0,0 +1,125 @@
|
||||
From c1ad46debbb821c842004cb723ba4d1b544fcae0 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 3 Jan 2015 02:52:50 +0100
|
||||
Subject: include: Add cuda.h.h
|
||||
|
||||
---
|
||||
include/Makefile.in | 1 +
|
||||
include/cuda.h | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 94 insertions(+)
|
||||
create mode 100644 include/cuda.h
|
||||
|
||||
diff --git a/include/Makefile.in b/include/Makefile.in
|
||||
index 40367eb..afd4a21 100644
|
||||
--- a/include/Makefile.in
|
||||
+++ b/include/Makefile.in
|
||||
@@ -196,6 +196,7 @@ SRCDIR_INCLUDES = \
|
||||
crtrow.idl \
|
||||
cryptdlg.h \
|
||||
cryptuiapi.h \
|
||||
+ cuda.h \
|
||||
custcntl.h \
|
||||
cvconst.h \
|
||||
d2dbasetypes.h \
|
||||
diff --git a/include/cuda.h b/include/cuda.h
|
||||
new file mode 100644
|
||||
index 0000000..1f20f5b
|
||||
--- /dev/null
|
||||
+++ b/include/cuda.h
|
||||
@@ -0,0 +1,93 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2015 Sebastian Lackner
|
||||
+ *
|
||||
+ * 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
|
||||
+ */
|
||||
+
|
||||
+#ifndef __WINE_CUDA_H
|
||||
+#define __WINE_CUDA_H
|
||||
+
|
||||
+#define CUDA_SUCCESS 0
|
||||
+#define CUDA_ERROR_INVALID_VALUE 1
|
||||
+#define CUDA_ERROR_OUT_OF_MEMORY 2
|
||||
+#define CUDA_ERROR_UNKNOWN 999
|
||||
+
|
||||
+#define CU_IPC_HANDLE_SIZE 64
|
||||
+
|
||||
+#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64) || defined(__aarch64__)
|
||||
+typedef unsigned long long CUdeviceptr;
|
||||
+#else
|
||||
+typedef unsigned int CUdeviceptr;
|
||||
+#endif
|
||||
+
|
||||
+typedef int CUGLDeviceList;
|
||||
+typedef int CUaddress_mode;
|
||||
+typedef int CUarray_format;
|
||||
+typedef int CUdevice;
|
||||
+typedef int CUdevice_attribute;
|
||||
+typedef int CUfilter_mode;
|
||||
+typedef int CUfunc_cache;
|
||||
+typedef int CUfunction_attribute;
|
||||
+typedef int CUipcMem_flags;
|
||||
+typedef int CUjitInputType;
|
||||
+typedef int CUjit_option;
|
||||
+typedef int CUlimit;
|
||||
+typedef int CUmemorytype;
|
||||
+typedef int CUpointer_attribute;
|
||||
+typedef int CUresourceViewFormat;
|
||||
+typedef int CUresourcetype;
|
||||
+typedef int CUresult;
|
||||
+typedef int CUsharedconfig;
|
||||
+
|
||||
+typedef void *CUDA_ARRAY3D_DESCRIPTOR;
|
||||
+typedef void *CUDA_ARRAY_DESCRIPTOR;
|
||||
+typedef void *CUDA_MEMCPY2D;
|
||||
+typedef void *CUDA_MEMCPY3D;
|
||||
+typedef void *CUDA_MEMCPY3D_PEER;
|
||||
+typedef void *CUDA_RESOURCE_DESC;
|
||||
+typedef void *CUDA_RESOURCE_VIEW_DESC;
|
||||
+typedef void *CUDA_TEXTURE_DESC;
|
||||
+typedef void *CUarray;
|
||||
+typedef void *CUcontext;
|
||||
+typedef void *CUdevprop;
|
||||
+typedef void *CUevent;
|
||||
+typedef void *CUfunction;
|
||||
+typedef void *CUgraphicsResource;
|
||||
+typedef void *CUlinkState;
|
||||
+typedef void *CUmipmappedArray;
|
||||
+typedef void *CUmodule;
|
||||
+typedef void *CUstream;
|
||||
+typedef void *CUsurfref;
|
||||
+typedef void *CUtexref;
|
||||
+
|
||||
+typedef unsigned long long CUsurfObject;
|
||||
+typedef unsigned long long CUtexObject;
|
||||
+
|
||||
+typedef struct CUipcEventHandle_st
|
||||
+{
|
||||
+ char reserved[CU_IPC_HANDLE_SIZE];
|
||||
+} CUipcEventHandle;
|
||||
+
|
||||
+typedef struct CUipcMemHandle_st
|
||||
+{
|
||||
+ char reserved[CU_IPC_HANDLE_SIZE];
|
||||
+} CUipcMemHandle;
|
||||
+
|
||||
+typedef struct CUuuid_st
|
||||
+{
|
||||
+ char bytes[16];
|
||||
+} CUuuid;
|
||||
+
|
||||
+#endif /* __WINE_CUDA_H */
|
||||
--
|
||||
2.2.1
|
||||
|
||||
440
patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch
Normal file
440
patches/nvcuda-CUDA_Support/0002-nvcuda-Add-stub-dll.patch
Normal file
@@ -0,0 +1,440 @@
|
||||
From 52e207eaf175a8aeb285b8aac5afc9ef65a81318 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sat, 3 Jan 2015 03:32:12 +0100
|
||||
Subject: nvcuda: Add stub dll.
|
||||
|
||||
---
|
||||
configure.ac | 1 +
|
||||
dlls/nvcuda/Makefile.in | 6 +
|
||||
dlls/nvcuda/nvcuda.c | 37 ++++++
|
||||
dlls/nvcuda/nvcuda.rc | 33 ++++++
|
||||
dlls/nvcuda/nvcuda.spec | 308 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
5 files changed, 385 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 94b83ab..feeb027 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -3125,6 +3125,7 @@ WINE_CONFIG_TEST(dlls/ntdsapi/tests)
|
||||
WINE_CONFIG_DLL(ntoskrnl.exe,,[implib])
|
||||
WINE_CONFIG_DLL(ntprint)
|
||||
WINE_CONFIG_TEST(dlls/ntprint/tests)
|
||||
+WINE_CONFIG_DLL(nvcuda)
|
||||
WINE_CONFIG_DLL(objsel,,[clean])
|
||||
WINE_CONFIG_DLL(odbc32,,[implib])
|
||||
WINE_CONFIG_DLL(odbccp32,,[implib])
|
||||
diff --git a/dlls/nvcuda/Makefile.in b/dlls/nvcuda/Makefile.in
|
||||
new file mode 100644
|
||||
index 0000000..4b33278
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/Makefile.in
|
||||
@@ -0,0 +1,6 @@
|
||||
+MODULE = nvcuda.dll
|
||||
+
|
||||
+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 0000000..eb1c67e
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/nvcuda.c
|
||||
@@ -0,0 +1,37 @@
|
||||
+/*
|
||||
+ * Copyright (C) 2014-2015 Sebastian Lackner
|
||||
+ *
|
||||
+ * 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 <stdarg.h>
|
||||
+
|
||||
+#include "windef.h"
|
||||
+#include "winbase.h"
|
||||
+
|
||||
+BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, LPVOID reserved)
|
||||
+{
|
||||
+ switch (reason)
|
||||
+ {
|
||||
+ case DLL_WINE_PREATTACH:
|
||||
+ return TRUE; /* prefer native version */
|
||||
+ case DLL_PROCESS_ATTACH:
|
||||
+ DisableThreadLibraryCalls(instance);
|
||||
+ break;
|
||||
+ }
|
||||
+
|
||||
+ return TRUE;
|
||||
+}
|
||||
diff --git a/dlls/nvcuda/nvcuda.rc b/dlls/nvcuda/nvcuda.rc
|
||||
new file mode 100644
|
||||
index 0000000..f135e83
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/nvcuda.rc
|
||||
@@ -0,0 +1,33 @@
|
||||
+/*
|
||||
+ * Top level resource file for nvcuda.dll
|
||||
+ *
|
||||
+ * Copyright (C) 2014-2015 Michael Müller
|
||||
+ *
|
||||
+ * 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 "winver.h"
|
||||
+
|
||||
+#define WINE_FILENAME_STR "nvcuda.dll"
|
||||
+#define WINE_FILEDESCRIPTION_STR "NVIDIA CUDA Driver, Version 337.88"
|
||||
+
|
||||
+#define WINE_FILEVERSION 8,17,13,3788
|
||||
+#define WINE_FILEVERSION_STR "8.17.13.3788"
|
||||
+
|
||||
+#define WINE_PRODUCTVERSION 8,17,13,3788
|
||||
+#define WINE_PRODUCTVERSION_STR "8.17.13.3788"
|
||||
+
|
||||
+#include "wine/wine_common_ver.rc"
|
||||
diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec
|
||||
new file mode 100644
|
||||
index 0000000..279f7ab
|
||||
--- /dev/null
|
||||
+++ b/dlls/nvcuda/nvcuda.spec
|
||||
@@ -0,0 +1,308 @@
|
||||
+@ stub cuArray3DCreate
|
||||
+@ stub cuArray3DCreate_v2
|
||||
+@ stub cuArray3DGetDescriptor
|
||||
+@ stub cuArray3DGetDescriptor_v2
|
||||
+@ stub cuArrayCreate
|
||||
+@ stub cuArrayCreate_v2
|
||||
+@ stub cuArrayDestroy
|
||||
+@ stub cuArrayGetDescriptor
|
||||
+@ stub cuArrayGetDescriptor_v2
|
||||
+@ stub cuCtxAttach
|
||||
+@ stub cuCtxCreate
|
||||
+@ stub cuCtxCreate_v2
|
||||
+@ stub cuCtxDestroy
|
||||
+@ stub cuCtxDestroy_v2
|
||||
+@ stub cuCtxDetach
|
||||
+@ stub cuCtxDisablePeerAccess
|
||||
+@ stub cuCtxEnablePeerAccess
|
||||
+@ stub cuCtxGetApiVersion
|
||||
+@ stub cuCtxGetCacheConfig
|
||||
+@ stub cuCtxGetCurrent
|
||||
+@ stub cuCtxGetDevice
|
||||
+@ stub cuCtxGetLimit
|
||||
+@ stub cuCtxGetSharedMemConfig
|
||||
+@ stub cuCtxGetStreamPriorityRange
|
||||
+@ stub cuCtxPopCurrent
|
||||
+@ stub cuCtxPopCurrent_v2
|
||||
+@ stub cuCtxPushCurrent
|
||||
+@ stub cuCtxPushCurrent_v2
|
||||
+@ stub cuCtxSetCacheConfig
|
||||
+@ stub cuCtxSetCurrent
|
||||
+@ stub cuCtxSetLimit
|
||||
+@ stub cuCtxSetSharedMemConfig
|
||||
+@ stub cuCtxSynchronize
|
||||
+@ stub cuD3D10CtxCreate
|
||||
+@ stub cuD3D10CtxCreateOnDevice
|
||||
+@ stub cuD3D10CtxCreate_v2
|
||||
+@ stub cuD3D10GetDevice
|
||||
+@ stub cuD3D10GetDevices
|
||||
+@ stub cuD3D10GetDirect3DDevice
|
||||
+@ stub cuD3D10MapResources
|
||||
+@ stub cuD3D10RegisterResource
|
||||
+@ stub cuD3D10ResourceGetMappedArray
|
||||
+@ stub cuD3D10ResourceGetMappedPitch
|
||||
+@ stub cuD3D10ResourceGetMappedPitch_v2
|
||||
+@ stub cuD3D10ResourceGetMappedPointer
|
||||
+@ stub cuD3D10ResourceGetMappedPointer_v2
|
||||
+@ stub cuD3D10ResourceGetMappedSize
|
||||
+@ stub cuD3D10ResourceGetMappedSize_v2
|
||||
+@ stub cuD3D10ResourceGetSurfaceDimensions
|
||||
+@ stub cuD3D10ResourceGetSurfaceDimensions_v2
|
||||
+@ stub cuD3D10ResourceSetMapFlags
|
||||
+@ stub cuD3D10UnmapResources
|
||||
+@ stub cuD3D10UnregisterResource
|
||||
+@ stub cuD3D11CtxCreate
|
||||
+@ stub cuD3D11CtxCreateOnDevice
|
||||
+@ stub cuD3D11CtxCreate_v2
|
||||
+@ stub cuD3D11GetDevice
|
||||
+@ stub cuD3D11GetDevices
|
||||
+@ stub cuD3D11GetDirect3DDevice
|
||||
+@ stub cuD3D9Begin
|
||||
+@ stub cuD3D9CtxCreate
|
||||
+@ stub cuD3D9CtxCreateOnDevice
|
||||
+@ stub cuD3D9CtxCreate_v2
|
||||
+@ stub cuD3D9End
|
||||
+@ stub cuD3D9GetDevice
|
||||
+@ stub cuD3D9GetDevices
|
||||
+@ stub cuD3D9GetDirect3DDevice
|
||||
+@ stub cuD3D9MapResources
|
||||
+@ stub cuD3D9MapVertexBuffer
|
||||
+@ stub cuD3D9MapVertexBuffer_v2
|
||||
+@ stub cuD3D9RegisterResource
|
||||
+@ stub cuD3D9RegisterVertexBuffer
|
||||
+@ stub cuD3D9ResourceGetMappedArray
|
||||
+@ stub cuD3D9ResourceGetMappedPitch
|
||||
+@ stub cuD3D9ResourceGetMappedPitch_v2
|
||||
+@ stub cuD3D9ResourceGetMappedPointer
|
||||
+@ stub cuD3D9ResourceGetMappedPointer_v2
|
||||
+@ stub cuD3D9ResourceGetMappedSize
|
||||
+@ stub cuD3D9ResourceGetMappedSize_v2
|
||||
+@ stub cuD3D9ResourceGetSurfaceDimensions
|
||||
+@ stub cuD3D9ResourceGetSurfaceDimensions_v2
|
||||
+@ stub cuD3D9ResourceSetMapFlags
|
||||
+@ stub cuD3D9UnmapResources
|
||||
+@ stub cuD3D9UnmapVertexBuffer
|
||||
+@ stub cuD3D9UnregisterResource
|
||||
+@ stub cuD3D9UnregisterVertexBuffer
|
||||
+@ stub cuDeviceCanAccessPeer
|
||||
+@ stub cuDeviceComputeCapability
|
||||
+@ stub cuDeviceGet
|
||||
+@ stub cuDeviceGetAttribute
|
||||
+@ stub cuDeviceGetByPCIBusId
|
||||
+@ stub cuDeviceGetCount
|
||||
+@ stub cuDeviceGetName
|
||||
+@ stub cuDeviceGetPCIBusId
|
||||
+@ stub cuDeviceGetProperties
|
||||
+@ stub cuDeviceTotalMem
|
||||
+@ stub cuDeviceTotalMem_v2
|
||||
+@ stub cuDriverGetVersion
|
||||
+@ stub cuEventCreate
|
||||
+@ stub cuEventDestroy
|
||||
+@ stub cuEventDestroy_v2
|
||||
+@ stub cuEventElapsedTime
|
||||
+@ stub cuEventQuery
|
||||
+@ stub cuEventRecord
|
||||
+@ stub cuEventSynchronize
|
||||
+@ stub cuFuncGetAttribute
|
||||
+@ stub cuFuncSetBlockShape
|
||||
+@ stub cuFuncSetCacheConfig
|
||||
+@ stub cuFuncSetSharedMemConfig
|
||||
+@ stub cuFuncSetSharedSize
|
||||
+@ stub cuGLCtxCreate
|
||||
+@ stub cuGLCtxCreate_v2
|
||||
+@ stub cuGLGetDevices
|
||||
+@ stub cuGLInit
|
||||
+@ stub cuGLMapBufferObject
|
||||
+@ stub cuGLMapBufferObjectAsync
|
||||
+@ stub cuGLMapBufferObjectAsync_v2
|
||||
+@ stub cuGLMapBufferObject_v2
|
||||
+@ stub cuGLRegisterBufferObject
|
||||
+@ stub cuGLSetBufferObjectMapFlags
|
||||
+@ stub cuGLUnmapBufferObject
|
||||
+@ stub cuGLUnmapBufferObjectAsync
|
||||
+@ stub cuGLUnregisterBufferObject
|
||||
+@ stub cuGetErrorName
|
||||
+@ stub cuGetErrorString
|
||||
+@ stub cuGetExportTable
|
||||
+@ stub cuGraphicsD3D10RegisterResource
|
||||
+@ stub cuGraphicsD3D11RegisterResource
|
||||
+@ stub cuGraphicsD3D9RegisterResource
|
||||
+@ stub cuGraphicsGLRegisterBuffer
|
||||
+@ stub cuGraphicsGLRegisterImage
|
||||
+@ stub cuGraphicsMapResources
|
||||
+@ stub cuGraphicsResourceGetMappedMipmappedArray
|
||||
+@ stub cuGraphicsResourceGetMappedPointer
|
||||
+@ stub cuGraphicsResourceGetMappedPointer_v2
|
||||
+@ stub cuGraphicsResourceSetMapFlags
|
||||
+@ stub cuGraphicsSubResourceGetMappedArray
|
||||
+@ stub cuGraphicsUnmapResources
|
||||
+@ stub cuGraphicsUnregisterResource
|
||||
+@ stub cuInit
|
||||
+@ stub cuIpcCloseMemHandle
|
||||
+@ stub cuIpcGetEventHandle
|
||||
+@ stub cuIpcGetMemHandle
|
||||
+@ stub cuIpcOpenEventHandle
|
||||
+@ stub cuIpcOpenMemHandle
|
||||
+@ stub cuLaunch
|
||||
+@ stub cuLaunchGrid
|
||||
+@ stub cuLaunchGridAsync
|
||||
+@ stub cuLaunchKernel
|
||||
+@ stub cuLinkAddData
|
||||
+@ stub cuLinkAddFile
|
||||
+@ stub cuLinkComplete
|
||||
+@ stub cuLinkCreate
|
||||
+@ stub cuLinkDestroy
|
||||
+@ stub cuMemAlloc
|
||||
+@ stub cuMemAllocHost
|
||||
+@ stub cuMemAllocHost_v2
|
||||
+@ stub cuMemAllocManaged
|
||||
+@ stub cuMemAllocPitch
|
||||
+@ stub cuMemAllocPitch_v2
|
||||
+@ stub cuMemAlloc_v2
|
||||
+@ stub cuMemFree
|
||||
+@ stub cuMemFreeHost
|
||||
+@ stub cuMemFree_v2
|
||||
+@ stub cuMemGetAddressRange
|
||||
+@ stub cuMemGetAddressRange_v2
|
||||
+@ stub cuMemGetInfo
|
||||
+@ stub cuMemGetInfo_v2
|
||||
+@ stub cuMemHostAlloc
|
||||
+@ stub cuMemHostGetDevicePointer
|
||||
+@ stub cuMemHostGetDevicePointer_v2
|
||||
+@ stub cuMemHostGetFlags
|
||||
+@ stub cuMemHostRegister
|
||||
+@ stub cuMemHostUnregister
|
||||
+@ stub cuMemcpy
|
||||
+@ stub cuMemcpy2D
|
||||
+@ stub cuMemcpy2DAsync
|
||||
+@ stub cuMemcpy2DAsync_v2
|
||||
+@ stub cuMemcpy2DUnaligned
|
||||
+@ stub cuMemcpy2DUnaligned_v2
|
||||
+@ stub cuMemcpy2D_v2
|
||||
+@ stub cuMemcpy3D
|
||||
+@ stub cuMemcpy3DAsync
|
||||
+@ stub cuMemcpy3DAsync_v2
|
||||
+@ stub cuMemcpy3DPeer
|
||||
+@ stub cuMemcpy3DPeerAsync
|
||||
+@ stub cuMemcpy3D_v2
|
||||
+@ stub cuMemcpyAsync
|
||||
+@ stub cuMemcpyAtoA
|
||||
+@ stub cuMemcpyAtoA_v2
|
||||
+@ stub cuMemcpyAtoD
|
||||
+@ stub cuMemcpyAtoD_v2
|
||||
+@ stub cuMemcpyAtoH
|
||||
+@ stub cuMemcpyAtoHAsync
|
||||
+@ stub cuMemcpyAtoHAsync_v2
|
||||
+@ stub cuMemcpyAtoH_v2
|
||||
+@ stub cuMemcpyDtoA
|
||||
+@ stub cuMemcpyDtoA_v2
|
||||
+@ stub cuMemcpyDtoD
|
||||
+@ stub cuMemcpyDtoDAsync
|
||||
+@ stub cuMemcpyDtoDAsync_v2
|
||||
+@ stub cuMemcpyDtoD_v2
|
||||
+@ stub cuMemcpyDtoH
|
||||
+@ stub cuMemcpyDtoHAsync
|
||||
+@ stub cuMemcpyDtoHAsync_v2
|
||||
+@ stub cuMemcpyDtoH_v2
|
||||
+@ stub cuMemcpyHtoA
|
||||
+@ stub cuMemcpyHtoAAsync
|
||||
+@ stub cuMemcpyHtoAAsync_v2
|
||||
+@ stub cuMemcpyHtoA_v2
|
||||
+@ stub cuMemcpyHtoD
|
||||
+@ stub cuMemcpyHtoDAsync
|
||||
+@ stub cuMemcpyHtoDAsync_v2
|
||||
+@ stub cuMemcpyHtoD_v2
|
||||
+@ stub cuMemcpyPeer
|
||||
+@ stub cuMemcpyPeerAsync
|
||||
+@ stub cuMemsetD16
|
||||
+@ stub cuMemsetD16Async
|
||||
+@ stub cuMemsetD16_v2
|
||||
+@ stub cuMemsetD2D16
|
||||
+@ stub cuMemsetD2D16Async
|
||||
+@ stub cuMemsetD2D16_v2
|
||||
+@ stub cuMemsetD2D32
|
||||
+@ stub cuMemsetD2D32Async
|
||||
+@ stub cuMemsetD2D32_v2
|
||||
+@ stub cuMemsetD2D8
|
||||
+@ stub cuMemsetD2D8Async
|
||||
+@ stub cuMemsetD2D8_v2
|
||||
+@ stub cuMemsetD32
|
||||
+@ stub cuMemsetD32Async
|
||||
+@ stub cuMemsetD32_v2
|
||||
+@ stub cuMemsetD8
|
||||
+@ stub cuMemsetD8Async
|
||||
+@ stub cuMemsetD8_v2
|
||||
+@ stub cuMipmappedArrayCreate
|
||||
+@ stub cuMipmappedArrayDestroy
|
||||
+@ stub cuMipmappedArrayGetLevel
|
||||
+@ stub cuModuleGetFunction
|
||||
+@ stub cuModuleGetGlobal
|
||||
+@ stub cuModuleGetGlobal_v2
|
||||
+@ stub cuModuleGetSurfRef
|
||||
+@ stub cuModuleGetTexRef
|
||||
+@ stub cuModuleLoad
|
||||
+@ stub cuModuleLoadData
|
||||
+@ stub cuModuleLoadDataEx
|
||||
+@ stub cuModuleLoadFatBinary
|
||||
+@ stub cuModuleUnload
|
||||
+@ stub cuParamSetSize
|
||||
+@ stub cuParamSetTexRef
|
||||
+@ stub cuParamSetf
|
||||
+@ stub cuParamSeti
|
||||
+@ stub cuParamSetv
|
||||
+@ stub cuPointerGetAttribute
|
||||
+@ stub cuPointerSetAttribute
|
||||
+@ stub cuProfilerInitialize
|
||||
+@ stub cuProfilerStart
|
||||
+@ stub cuProfilerStop
|
||||
+@ stub cuStreamAddCallback
|
||||
+@ stub cuStreamAttachMemAsync
|
||||
+@ stub cuStreamCreate
|
||||
+@ stub cuStreamCreateWithPriority
|
||||
+@ stub cuStreamDestroy
|
||||
+@ stub cuStreamDestroy_v2
|
||||
+@ stub cuStreamGetFlags
|
||||
+@ stub cuStreamGetPriority
|
||||
+@ stub cuStreamQuery
|
||||
+@ stub cuStreamSynchronize
|
||||
+@ stub cuStreamWaitEvent
|
||||
+@ stub cuSurfObjectCreate
|
||||
+@ stub cuSurfObjectDestroy
|
||||
+@ stub cuSurfObjectGetResourceDesc
|
||||
+@ stub cuSurfRefGetArray
|
||||
+@ stub cuSurfRefSetArray
|
||||
+@ stub cuTexObjectCreate
|
||||
+@ stub cuTexObjectDestroy
|
||||
+@ stub cuTexObjectGetResourceDesc
|
||||
+@ stub cuTexObjectGetResourceViewDesc
|
||||
+@ stub cuTexObjectGetTextureDesc
|
||||
+@ stub cuTexRefCreate
|
||||
+@ stub cuTexRefDestroy
|
||||
+@ stub cuTexRefGetAddress
|
||||
+@ stub cuTexRefGetAddressMode
|
||||
+@ stub cuTexRefGetAddress_v2
|
||||
+@ stub cuTexRefGetArray
|
||||
+@ stub cuTexRefGetFilterMode
|
||||
+@ stub cuTexRefGetFlags
|
||||
+@ stub cuTexRefGetFormat
|
||||
+@ stub cuTexRefGetMaxAnisotropy
|
||||
+@ stub cuTexRefGetMipmapFilterMode
|
||||
+@ stub cuTexRefGetMipmapLevelBias
|
||||
+@ stub cuTexRefGetMipmapLevelClamp
|
||||
+@ stub cuTexRefGetMipmappedArray
|
||||
+@ stub cuTexRefSetAddress
|
||||
+@ stub cuTexRefSetAddress2D
|
||||
+@ stub cuTexRefSetAddress2D_v2
|
||||
+@ stub cuTexRefSetAddress2D_v3
|
||||
+@ stub cuTexRefSetAddressMode
|
||||
+@ stub cuTexRefSetAddress_v2
|
||||
+@ stub cuTexRefSetArray
|
||||
+@ stub cuTexRefSetFilterMode
|
||||
+@ stub cuTexRefSetFlags
|
||||
+@ stub cuTexRefSetFormat
|
||||
+@ stub cuTexRefSetMaxAnisotropy
|
||||
+@ stub cuTexRefSetMipmapFilterMode
|
||||
+@ stub cuTexRefSetMipmapLevelBias
|
||||
+@ stub cuTexRefSetMipmapLevelClamp
|
||||
+@ stub cuTexRefSetMipmappedArray
|
||||
+@ stub cuWGLGetDevice
|
||||
--
|
||||
2.2.1
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1,4 +1,4 @@
|
||||
From cfce86cc5bde3a614bba4a7a20a38d78040afbc2 Mon Sep 17 00:00:00 2001
|
||||
From 0e75f4bd32d59b9237765127314d2fc159d7ca6f Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Fri, 2 Jan 2015 21:48:23 +0100
|
||||
Subject: nvcuda: Add Unknown5 internal interface.
|
||||
@@ -8,7 +8,7 @@ Subject: nvcuda: Add Unknown5 internal interface.
|
||||
1 file changed, 40 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/nvcuda/internal.c b/dlls/nvcuda/internal.c
|
||||
index 6e4f0e0..6f9e388 100755
|
||||
index 839d85c..cff10db 100755
|
||||
--- a/dlls/nvcuda/internal.c
|
||||
+++ b/dlls/nvcuda/internal.c
|
||||
@@ -98,6 +98,8 @@ static const CUuuid UUID_Unknown4 = {{0xC6, 0x93, 0x33, 0x6E,
|
||||
@@ -1,4 +1,4 @@
|
||||
From 7288507b49c61d2314ad042cb4c467701aa85cd5 Mon Sep 17 00:00:00 2001
|
||||
From 5aa66ddfe07ae62f845815bf0b7edfbe3baff883 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 3 Jan 2015 00:25:08 +0100
|
||||
Subject: nvcuda: Emulate two d3d9 initialization functions.
|
||||
@@ -9,18 +9,18 @@ Subject: nvcuda: Emulate two d3d9 initialization functions.
|
||||
2 files changed, 31 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/nvcuda/nvcuda.c b/dlls/nvcuda/nvcuda.c
|
||||
index e074f90..61fe0e3 100644
|
||||
index 8c134cb..3ccf54a 100644
|
||||
--- a/dlls/nvcuda/nvcuda.c
|
||||
+++ b/dlls/nvcuda/nvcuda.c
|
||||
@@ -30,6 +30,7 @@
|
||||
#include <cuda.h>
|
||||
#include <cudaGL.h>
|
||||
@@ -29,6 +29,7 @@
|
||||
#include "wine/wgl.h"
|
||||
#include "cuda.h"
|
||||
#include "nvcuda.h"
|
||||
+#include "d3d9.h"
|
||||
|
||||
#if defined(__x86_64) || defined(AMD64) || defined(_M_AMD64)
|
||||
#define DEV_PTR "%llu"
|
||||
@@ -2102,6 +2103,34 @@ CUresult WINAPI wine_cuTexRefSetMipmappedArray(CUtexref hTexRef, CUmipmappedArra
|
||||
@@ -2101,6 +2102,34 @@ CUresult WINAPI wine_cuTexRefSetMipmappedArray(CUtexref hTexRef, CUmipmappedArra
|
||||
return pcuTexRefSetMipmappedArray(hTexRef, hMipmappedArray, Flags);
|
||||
}
|
||||
|
||||
@@ -56,23 +56,23 @@ index e074f90..61fe0e3 100644
|
||||
{
|
||||
TRACE("(%p, %u, %p)\n", instance, reason, reserved);
|
||||
diff --git a/dlls/nvcuda/nvcuda.spec b/dlls/nvcuda/nvcuda.spec
|
||||
index 720cebf..bae5cd3 100644
|
||||
index 621b8d5..510280c 100644
|
||||
--- a/dlls/nvcuda/nvcuda.spec
|
||||
+++ b/dlls/nvcuda/nvcuda.spec
|
||||
@@ -58,11 +58,11 @@
|
||||
58 stub cuD3D11GetDevices
|
||||
59 stub cuD3D11GetDirect3DDevice
|
||||
60 stub cuD3D9Begin
|
||||
-61 stub cuD3D9CtxCreate
|
||||
@ stub cuD3D11GetDevices
|
||||
@ stub cuD3D11GetDirect3DDevice
|
||||
@ stub cuD3D9Begin
|
||||
-@ stub cuD3D9CtxCreate
|
||||
+@ stdcall cuD3D9CtxCreate(ptr ptr long ptr) wine_cuD3D9CtxCreate
|
||||
62 stub cuD3D9CtxCreateOnDevice
|
||||
63 stub cuD3D9CtxCreate_v2
|
||||
64 stub cuD3D9End
|
||||
-65 stub cuD3D9GetDevice
|
||||
@ stub cuD3D9CtxCreateOnDevice
|
||||
@ stub cuD3D9CtxCreate_v2
|
||||
@ stub cuD3D9End
|
||||
-@ stub cuD3D9GetDevice
|
||||
+@ stdcall cuD3D9GetDevice(ptr str) wine_cuD3D9GetDevice
|
||||
66 stub cuD3D9GetDevices
|
||||
67 stub cuD3D9GetDirect3DDevice
|
||||
68 stub cuD3D9MapResources
|
||||
@ stub cuD3D9GetDevices
|
||||
@ stub cuD3D9GetDirect3DDevice
|
||||
@ stub cuD3D9MapResources
|
||||
--
|
||||
1.9.1
|
||||
2.2.1
|
||||
|
||||
Reference in New Issue
Block a user