Skip to content

Commit d098cb4

Browse files
committed
Add cuGetDeviceUuid
This is needed to match a device selected from Vulkan when doing interop.
1 parent 8a44736 commit d098cb4

File tree

3 files changed

+8
-1
lines changed

3 files changed

+8
-1
lines changed

ffnvcodec.pc.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ includedir=${prefix}/include
33

44
Name: ffnvcodec
55
Description: FFmpeg version of Nvidia Codec SDK headers
6-
Version: 8.2.15.1
6+
Version: 8.2.15.2
77
Cflags: -I${includedir}

include/ffnvcodec/dynlink_cuda.h

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,10 @@ typedef enum CUexternalMemoryHandleType_enum {
100100
CU_EXTERNAL_MEMORY_HANDLE_TYPE_D3D12_RESOURCE = 5,
101101
} CUexternalMemoryHandleType;
102102

103+
typedef struct CUuuid_st {
104+
char bytes[16];
105+
} CUuuid;
106+
103107
typedef struct CUDA_MEMCPY2D_st {
104108
size_t srcXInBytes;
105109
size_t srcY;
@@ -178,6 +182,7 @@ typedef CUresult CUDAAPI tcuInit(unsigned int Flags);
178182
typedef CUresult CUDAAPI tcuDeviceGetCount(int *count);
179183
typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);
180184
typedef CUresult CUDAAPI tcuDeviceGetName(char *name, int len, CUdevice dev);
185+
typedef CUresult CUDAAPI tcuDeviceGetUuid(CUuuid *uuid, CUdevice dev);
181186
typedef CUresult CUDAAPI tcuDeviceComputeCapability(int *major, int *minor, CUdevice dev);
182187
typedef CUresult CUDAAPI tcuCtxCreate_v2(CUcontext *pctx, unsigned int flags, CUdevice dev);
183188
typedef CUresult CUDAAPI tcuCtxSetLimit(CUlimit limit, size_t value);

include/ffnvcodec/dynlink_loader.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ typedef struct CudaFunctions {
140140
tcuDeviceGetCount *cuDeviceGetCount;
141141
tcuDeviceGet *cuDeviceGet;
142142
tcuDeviceGetName *cuDeviceGetName;
143+
tcuDeviceGetUuid *cuDeviceGetUuid;
143144
tcuDeviceComputeCapability *cuDeviceComputeCapability;
144145
tcuCtxCreate_v2 *cuCtxCreate;
145146
tcuCtxSetLimit *cuCtxSetLimit;
@@ -248,6 +249,7 @@ static inline int cuda_load_functions(CudaFunctions **functions, void *logctx)
248249
LOAD_SYMBOL(cuDeviceGetCount, tcuDeviceGetCount, "cuDeviceGetCount");
249250
LOAD_SYMBOL(cuDeviceGet, tcuDeviceGet, "cuDeviceGet");
250251
LOAD_SYMBOL(cuDeviceGetName, tcuDeviceGetName, "cuDeviceGetName");
252+
LOAD_SYMBOL(cuDeviceGetUuid, tcuDeviceGetUuid, "cuDeviceGetUuid");
251253
LOAD_SYMBOL(cuDeviceComputeCapability, tcuDeviceComputeCapability, "cuDeviceComputeCapability");
252254
LOAD_SYMBOL(cuCtxCreate, tcuCtxCreate_v2, "cuCtxCreate_v2");
253255
LOAD_SYMBOL(cuCtxSetLimit, tcuCtxSetLimit, "cuCtxSetLimit");

0 commit comments

Comments
 (0)