Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- diff --git a/libfreerdp/primitives/prim_YUV_opencl.c b/libfreerdp/primitives/prim_YUV_opencl.c
- index 3d9bf9148..071236d3d 100644
- --- a/libfreerdp/primitives/prim_YUV_opencl.c
- +++ b/libfreerdp/primitives/prim_YUV_opencl.c
- @@ -323,9 +323,14 @@ out_program_create:
- BOOL primitives_init_opencl(primitives_t* prims)
- {
- + primitives_t* p = primitives_get_by_type(PRIMITIVES_ONLY_CPU);
- + if (!p)
- + return FALSE;
- +
- if (!primitives_init_opencl_context(&openclContext))
- return FALSE;
- + *prims = *p;
- primitives_init_YUV_opencl(prims);
- prims->flags |= PRIM_FLAGS_HAVE_EXTGPU;
- prims->uninit = primitives_uninit_opencl;
- @@ -351,8 +356,6 @@ static pstatus_t opencl_YUV420ToRGB_8u_P3AC4R(const BYTE* pSrc[3], const UINT32
- default:
- {
- primitives_t* p = primitives_get_by_type(PRIMITIVES_ONLY_CPU);
- - if (!p)
- - p = primitives_get_by_type(PRIMITIVES_PURE_SOFT);
- if (!p)
- return -1;
- return p->YUV420ToRGB_8u_P3AC4R(pSrc, srcStep, pDst, dstStep, DstFormat, roi);
- diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c
- index e385f7b6f..13df8b26c 100644
- --- a/libfreerdp/primitives/primitives.c
- +++ b/libfreerdp/primitives/primitives.c
- @@ -387,14 +387,14 @@ primitives_t* primitives_get_by_type(DWORD type)
- InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL);
- switch (type)
- {
- -#if defined(WITH_OPENCL)
- case PRIMITIVES_ONLY_GPU:
- +#if defined(WITH_OPENCL)
- if (!InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, NULL, NULL))
- return NULL;
- return &pPrimitivesGpu;
- #endif
- -#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
- case PRIMITIVES_ONLY_CPU:
- +#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
- if (!InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL))
- return NULL;
- return &pPrimitivesCpu;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement