Add support for OpenCLOn12 ICD #103
Conversation
|
|
|
@nikhiljnv @b-sumner @saleelk did you want to review these changes? If so, can you please provide feedback by EOW? |
|
LGTM |
|
Looks good to me !! |
+1 for the distribution method. Eagerly awaiting GA (or a Store link 😉). |
| HRESULT hrInit = Windows::Foundation::Initialize(RO_INIT_MULTITHREADED); | ||
| if (hrInit == RPC_E_CHANGED_MODE) | ||
| { | ||
| hrInit = Windows::Foundation::Initialize(RO_INIT_SINGLETHREADED); |
There was a problem hiding this comment.
Does this only happen in cases where the application itself is expected to be single threaded? I don't really understand the implications of falling back, or in what cases it would happen, but if the assumption above is true, seems good.
There was a problem hiding this comment.
Yeah, if the app has already initialized COM or WinRT as singlethreaded on the thread where the loader is being initialized, then we have to use singlethreaded as well. In all other cases (already initialized as multi-threaded, or uninitialized), we'll use multithreaded.
| @@ -256,7 +256,12 @@ void khrIcdOsVendorsEnumerateOnce() | |||
| // dynamically load a library. returns NULL on failure | |||
| void *khrIcdOsLibraryLoad(const char *libraryName) | |||
| { | |||
| return (void *)LoadLibraryA(libraryName); | |||
| HMODULE hTemp = LoadLibraryExA(libraryName, NULL, LOAD_WITH_ALTERED_SEARCH_PATH); | |||
|
Thanks everyone! Merging. |
|
Thanks everyone! |
* Add search for OpenCLOn12 mapping layer package. * Use altered search path for ICD loading. * Update version to 2.2.7
The OpenCLOn12 project (announced here) doesn't look like a normal ICD. On Windows, ICDs are enumerated in three ways:
The OpenCLOn12 ICD won't be tied to any given hardware, and its distribution mechanism doesn't allow to modify the registry. This ICD will be shipping inside an app package, delivered by the Windows store. We'd like to add explicit logic to the ICD loader to look for this package, and if installed, load the ICD out of it.
Since this ICD doesn't have an adapter LUID associated with it, its platform will be relegated to the end of the platform list. This behavior is probably for the best.