mirrors/FreeRDP
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed init code.

Browse Source
This commit is contained in:
Armin Novak 2019-11-07 16:04:48 +01:00 committed by akallabeth
parent 733c70cd25
commit 00e9efd189
1 changed files with 29 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
libfreerdp/primitives/primitives.c
View File

@ -53,9 +53,13 @@ static INIT_ONCE generic_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
static primitives_t pPrimitivesCpu = { 0 }; static primitives_t pPrimitivesCpu = { 0 };
static INIT_ONCE cpu_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#endif #endif
#if defined(WITH_OPENCL) #if defined(WITH_OPENCL)
static primitives_t pPrimitivesGpu = { 0 }; static primitives_t pPrimitivesGpu = { 0 };
static INIT_ONCE gpu_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#endif #endif
#if defined(HAVE_OPTIMIZED_PRIMITIVES) #if defined(HAVE_OPTIMIZED_PRIMITIVES)
@ -63,7 +67,6 @@ static INIT_ONCE auto_primitives_InitOnce = INIT_ONCE_STATIC_INIT;
#endif #endif
static primitives_t pPrimitives = { 0 }; static primitives_t pPrimitives = { 0 };
static INIT_ONCE primitives_InitOnce = INIT_ONCE_STATIC_INIT;
/* ------------------------------------------------------------------------- */ /* ------------------------------------------------------------------------- */
static BOOL primitives_init_generic(primitives_t *prims) static BOOL primitives_init_generic(primitives_t *prims)
@ -281,23 +284,33 @@ out:
return ret; return ret;
} }
static BOOL CALLBACK primitives_init_cb(PINIT_ONCE once, PVOID param, PVOID* context) #if defined(WITH_OPENCL)
static BOOL CALLBACK primitives_init_gpu_cb(PINIT_ONCE once, PVOID param, PVOID* context)
{ {
WINPR_UNUSED(once); WINPR_UNUSED(once);
WINPR_UNUSED(param); WINPR_UNUSED(param);
WINPR_UNUSED(context); WINPR_UNUSED(context);
#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
if (!primitives_init_optimized(&pPrimitivesCpu))
return FALSE;
#endif
#if defined(WITH_OPENCL)
if (!primitives_init_opencl(&pPrimitivesGpu)) if (!primitives_init_opencl(&pPrimitivesGpu))
return FALSE; return FALSE;
#endif
return TRUE; return TRUE;
} }
#endif
#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
static BOOL CALLBACK primitives_init_cpu_cb(PINIT_ONCE once, PVOID param, PVOID* context)
{
WINPR_UNUSED(once);
WINPR_UNUSED(param);
WINPR_UNUSED(context);
if (!primitives_init_optimized(&pPrimitivesCpu))
return FALSE;
return TRUE;
}
#endif
static BOOL CALLBACK primitives_auto_init_cb(PINIT_ONCE once, PVOID param, PVOID* context) static BOOL CALLBACK primitives_auto_init_cb(PINIT_ONCE once, PVOID param, PVOID* context)
{ {
@ -351,7 +364,12 @@ void primitives_uninit()
static void setup(void) static void setup(void)
{ {
InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL); InitOnceExecuteOnce(&generic_primitives_InitOnce, primitives_init_generic_cb, NULL, NULL);
InitOnceExecuteOnce(&primitives_InitOnce, primitives_init_cb, NULL, NULL); #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL);
#endif
#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_gpu_cb, NULL, NULL);
#endif
InitOnceExecuteOnce(&auto_primitives_InitOnce, primitives_auto_init_cb, NULL, NULL); InitOnceExecuteOnce(&auto_primitives_InitOnce, primitives_auto_init_cb, NULL, NULL);
} }
@ -374,12 +392,12 @@ primitives_t* primitives_get_by_type(DWORD type)
{ {
#if defined(WITH_OPENCL) #if defined(WITH_OPENCL)
case PRIMITIVES_ONLY_GPU: case PRIMITIVES_ONLY_GPU:
InitOnceExecuteOnce(&primitives_InitOnce, primitives_init_cb, NULL, NULL); InitOnceExecuteOnce(&gpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL);
return &pPrimitivesGpu; return &pPrimitivesGpu;
#endif #endif
#if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES) #if defined(HAVE_CPU_OPTIMIZED_PRIMITIVES)
case PRIMITIVES_ONLY_CPU: case PRIMITIVES_ONLY_CPU:
InitOnceExecuteOnce(&primitives_InitOnce, primitives_init_cb, NULL, NULL); InitOnceExecuteOnce(&cpu_primitives_InitOnce, primitives_init_cpu_cb, NULL, NULL);
return &pPrimitivesCpu; return &pPrimitivesCpu;
#endif #endif
case PRIMITIVES_PURE_SOFT: case PRIMITIVES_PURE_SOFT: