| Message ID | 081BF0CE-2F01-4B4E-A858-971E7FAE6CD0@googlemail.com |
|---|---|
| State | New |
| Headers | show |
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Thu, 26 Apr 2018 17:09:14 +0200 Daniel Oberhoff <danieloberhoff@googlemail.com> wrote: > > On 26. Apr 2018, at 16:20, Daniel Oberhoff > > <daniel@danieloberhoff.de> wrote: > > > > --- > > include/ffnvcodec/dynlink_cuda.h | 8 ++++++++ > > 1 file changed, 8 insertions(+) > > > > diff --git a/include/ffnvcodec/dynlink_cuda.h > > b/include/ffnvcodec/dynlink_cuda.h index 2cc50bb..df1d316 100644 > > --- a/include/ffnvcodec/dynlink_cuda.h > > +++ b/include/ffnvcodec/dynlink_cuda.h > > @@ -68,6 +68,14 @@ typedef enum CUlimit_enum { > > CU_LIMIT_DEV_RUNTIME_PENDING_LAUNCH_COUNT = 4 > > } CUlimit; > > > > +typedef enum CUgraphicsRegisterFlags_enum { > > + CU_GRAPHICS_REGISTER_FLAGS_NONE = 0x00, > > + CU_GRAPHICS_REGISTER_FLAGS_READ_ONLY = 0x01, > > + CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD = 0x02, > > + CU_GRAPHICS_REGISTER_FLAGS_SURFACE_LDST = 0x04, > > + CU_GRAPHICS_REGISTER_FLAGS_TEXTURE_GATHER = 0x08 > > +} CUgraphicsRegisterFlags; > > + > > typedef struct CUDA_MEMCPY2D_st { > > size_t srcXInBytes; > > size_t srcY; > > -- > > 2.14.3 (Apple Git-98) > > > > > also need this > > --- > include/ffnvcodec/dynlink_cuda.h | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/include/ffnvcodec/dynlink_cuda.h > b/include/ffnvcodec/dynlink_cuda.h index df1d316..24c37a7 100644 > --- a/include/ffnvcodec/dynlink_cuda.h > +++ b/include/ffnvcodec/dynlink_cuda.h > @@ -107,8 +107,6 @@ typedef enum CUGLDeviceList_enum { > CU_GL_DEVICE_LIST_NEXT_FRAME = 3, > } CUGLDeviceList; > > -#define CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD 2 > - > typedef CUresult CUDAAPI tcuInit(unsigned int Flags); > typedef CUresult CUDAAPI tcuDeviceGetCount(int *count); > typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal); > -- > 2.14.3 (Apple Git-98) > Looks fine. - --phil - --phil -----BEGIN PGP SIGNATURE----- iEYEARECAAYFAlrkjSkACgkQ+NaxlGp1aC5WtACZAQE/z07C8zfwWK7o/MFkeWKi FDsAoI9eMc8zTEicsdszh6zqraJh59Yx =dBxi -----END PGP SIGNATURE-----
pushed equivalent changes as part of a different patch Also started an sdk/8.0 branch and backported all non-video-sdk changes there.
diff --git a/include/ffnvcodec/dynlink_cuda.h b/include/ffnvcodec/dynlink_cuda.h index df1d316..24c37a7 100644 --- a/include/ffnvcodec/dynlink_cuda.h +++ b/include/ffnvcodec/dynlink_cuda.h @@ -107,8 +107,6 @@ typedef enum CUGLDeviceList_enum { CU_GL_DEVICE_LIST_NEXT_FRAME = 3, } CUGLDeviceList; -#define CU_GRAPHICS_REGISTER_FLAGS_WRITE_DISCARD 2 - typedef CUresult CUDAAPI tcuInit(unsigned int Flags); typedef CUresult CUDAAPI tcuDeviceGetCount(int *count); typedef CUresult CUDAAPI tcuDeviceGet(CUdevice *device, int ordinal);