Browse Source

Use correct boolean testing and long enough string for cl_amd_media ops testing and kernel changing.

nfactor-troky
Con Kolivas 14 years ago
parent
commit
407df0f4b1
  1. 18
      ocl.c

18
ocl.c

@ -270,6 +270,7 @@ _clState *initCl(int gpu, char *name, size_t nameSize)
char * extensions = malloc(1024); char * extensions = malloc(1024);
for (i = 0; i < numDevices; i++) { for (i = 0; i < numDevices; i++) {
const char * camo = "cl_amd_media_ops";
size_t retlen; size_t retlen;
char *find; char *find;
@ -278,11 +279,12 @@ _clState *initCl(int gpu, char *name, size_t nameSize)
applog(LOG_ERR, "Error: Failed to clGetDeviceInfo when trying to get CL_DEVICE_EXTENSIONS"); applog(LOG_ERR, "Error: Failed to clGetDeviceInfo when trying to get CL_DEVICE_EXTENSIONS");
return NULL; return NULL;
} }
find = memmem(extensions, retlen, "cl_amd_media_ops", 16); find = strstr(extensions, camo);
if (find) if (find)
hasBitAlign = true; hasBitAlign = true;
} }
if (hasBitAlign)
if (hasBitAlign == false)
applog(LOG_INFO, "cl_amd_media_ops not found, will not BFI_INT patch"); applog(LOG_INFO, "cl_amd_media_ops not found, will not BFI_INT patch");
else else
applog(LOG_INFO, "cl_amd_media_ops found, will patch with BFI_INT"); applog(LOG_INFO, "cl_amd_media_ops found, will patch with BFI_INT");
@ -294,12 +296,12 @@ _clState *initCl(int gpu, char *name, size_t nameSize)
/* Load a different kernel depending on whether it supports /* Load a different kernel depending on whether it supports
* cl_amd_media_ops or not */ * cl_amd_media_ops or not */
char *filename; char *filename;
if (hasBitAlign) { if (hasBitAlign == true) {
filename = malloc(9); filename = malloc(10);
strncpy(filename, "poclbm.cl", 9); strncpy(filename, "poclbm.cl", 10);
} else { } else {
filename = malloc(15); filename = malloc(16);
strncpy(filename, "poclbm_noamd.cl", 15); strncpy(filename, "poclbm_noamd.cl", 16);
} }
int pl; int pl;
@ -328,7 +330,7 @@ _clState *initCl(int gpu, char *name, size_t nameSize)
} }
/* Patch the kernel if the hardware supports BFI_INT */ /* Patch the kernel if the hardware supports BFI_INT */
if (hasBitAlign) { if (hasBitAlign == true) {
size_t nDevices; size_t nDevices;
size_t * binary_sizes; size_t * binary_sizes;
char ** binaries; char ** binaries;

Loading…
Cancel
Save