Advertisement
Guest User

Untitled

a guest
Nov 13th, 2019
87
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 2.25 KB | None | 0 0
  1. diff --git a/libfreerdp/primitives/prim_YUV_opencl.c b/libfreerdp/primitives/prim_YUV_opencl.c
  2. index 3d9bf9148..071236d3d 100644
  3. --- a/libfreerdp/primitives/prim_YUV_opencl.c
  4. +++ b/libfreerdp/primitives/prim_YUV_opencl.c
  5. @@ -323,9 +323,14 @@ out_program_create:
  6.  
  7. BOOL primitives_init_opencl(primitives_t* prims)
  8. {
  9. + primitives_t* p = primitives_get_by_type(PRIMITIVES_ONLY_CPU);
  10. + if (!p)
  11. + return FALSE;
  12. +
  13. if (!primitives_init_opencl_context(&openclContext))
  14. return FALSE;
  15.  
  16. + *prims = *p;
  17. primitives_init_YUV_opencl(prims);
  18. prims->flags |= PRIM_FLAGS_HAVE_EXTGPU;
  19. prims->uninit = primitives_uninit_opencl;
  20. @@ -351,8 +356,6 @@ static pstatus_t opencl_YUV420ToRGB_8u_P3AC4R(const BYTE* pSrc[3], const UINT32
  21. default:
  22. {
  23. primitives_t* p = primitives_get_by_type(PRIMITIVES_ONLY_CPU);
  24. - if (!p)
  25. - p = primitives_get_by_type(PRIMITIVES_PURE_SOFT);
  26. if (!p)
  27. return -1;
  28. return p->YUV420ToRGB_8u_P3AC4R(pSrc, srcStep, pDst, dstStep, DstFormat, roi);
  29. diff --git a/libfreerdp/primitives/primitives.c b/libfreerdp/primitives/primitives.c
  30. index e385f7b6f..13df8b26c 100644
  31. --- a/libfreerdp/primitives/primitives.c
  32. +++ b/libfreerdp/primitives/primitives.c
  33. @@ -387,14 +387,14 @@ primitives_t* primitives_get_by_type(DWORD type)
  34. InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL);
  35. switch (type)
  36. {
  37. -#if defined(WITH_OPENCL)
  38. case PRIMITIVES_ONLY_GPU:
  39. +#if defined(WITH_OPENCL)
  40. if (!InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, NULL, NULL))
  41. return NULL;
  42. return &pPrimitivesGpu;
  43. #endif
  44. -#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
  45. case PRIMITIVES_ONLY_CPU:
  46. +#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
  47. if (!InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL))
  48. return NULL;
  49. return &pPrimitivesCpu;
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement