diff options
| author | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
|---|---|---|
| committer | Rodeo <[email protected]> | 2013-11-08 21:21:02 +0000 |
| commit | 43f0bc9d538c86ea75a5cd627a81452e9d76b825 (patch) | |
| tree | a6bde5c2174543e4ea282ab26b6a2c76829105eb /libhb/vadxva2.h | |
| parent | d0a2953efbce340e34a971b9481024a51ae52383 (diff) | |
OpenCL: use the new library loading architecture for all OpenCL code.
An OpenCL SDK is no longer needed to build OpenCL support.
Note: as a result, the --enable-opencl configure option is removed.
Also, libOpenCL is no longer needed to run the application (it is still necessary to use OpenCL features, of course).
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5886 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/vadxva2.h')
| -rw-r--r-- | libhb/vadxva2.h | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/libhb/vadxva2.h b/libhb/vadxva2.h index cd879b974..39165e188 100644 --- a/libhb/vadxva2.h +++ b/libhb/vadxva2.h @@ -11,15 +11,17 @@ */ -#ifndef VA_DXVA2_H -#define VA_DXVA2_H - #ifdef USE_HWD + +#ifndef HB_VA_DXVA2_H +#define HB_VA_DXVA2_H + #include "hbffmpeg.h" #include "d3d9.h" #include "libavcodec/dxva2.h" #include "dxva2api.h" #include "common.h" +#include "opencl.h" #include "openclwrapper.h" #define HB_FOURCC( a, b, c, d ) ( ((uint32_t)a) | ( ((uint32_t)b) << 8 ) | ( ((uint32_t)c) << 16 ) | ( ((uint32_t)d) << 24 ) ) @@ -133,21 +135,18 @@ typedef struct int do_job; // running nv12toyuv kernel. -#ifdef USE_OPENCL cl_kernel nv12toyuv; cl_mem cl_mem_nv12; cl_mem cl_mem_yuv; uint8_t * nv12toyuv_tmp_in; uint8_t * nv12toyuv_tmp_out; -#endif } hb_va_dxva2_t; typedef struct FilterLink_T { -#ifdef USE_OPENCL cl_mem cl_inbuf; cl_mem cl_outbuf; -#endif + uint8_t *mem_inbuf; uint8_t *mem_outbuf; int width; @@ -209,5 +208,7 @@ void hb_va_new_dxva2( hb_va_dxva2_t *dxva2, AVCodecContext *p_context ); void hb_va_release( hb_va_dxva2_t *dxva2, AVFrame *frame ); void hb_va_close( hb_va_dxva2_t *dxva2 ); int hb_check_hwd_fmt( int fmt ); -#endif -#endif + +#endif // HB_VA_DXVA2_H + +#endif // USE_HWD |