Build ICD Loader using Clang on Windows #177
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -18,6 +18,15 @@ | |
| * Author: Lenny Komow <[email protected]> | ||
| */ | ||
|
|
||
| // System types aren't ISO compliant | ||
| #if defined(_MSC_VER) && !defined(__clang__) | ||
| #pragma warning( push ) | ||
| #pragma warning( disable : 4201 ) | ||
| #elif defined(__clang__) | ||
| #pragma clang diagnostic push | ||
| #pragma clang diagnostic ignored "-Wc11-extensions" | ||
| #endif | ||
|
|
||
| typedef struct LoaderEnumAdapters2 { | ||
| ULONG adapter_count; | ||
| struct { | ||
|
|
@@ -78,3 +87,9 @@ typedef struct LoaderQueryRegistryInfo { | |
| BYTE output_binary[1]; | ||
| }; | ||
| } LoaderQueryRegistryInfo; | ||
|
|
||
| #if defined(_MSC_VER) && !defined(__clang__) | ||
| #pragma warning( pop ) | ||
| #elif defined(__clang__) | ||
| #pragma clang diagnostic pop | ||
| #endif | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -93,7 +93,7 @@ clGetPlatformIDs(cl_uint num_entries , | |
| } | ||
|
|
||
| CL_API_ENTRY cl_int CL_API_CALL | ||
| clGetPlatformInfo(cl_platform_id _platform, | ||
| cl_platform_info param_name, | ||
| size_t param_value_size, | ||
| void * param_value, | ||
|
|
@@ -117,22 +117,22 @@ clGetPlatformInfo(cl_platform_id platform, | |
| // select the string to return | ||
| switch(param_name) { | ||
| case CL_PLATFORM_PROFILE: | ||
| returnString = _platform->profile; | ||
| break; | ||
| case CL_PLATFORM_VERSION: | ||
| returnString = _platform->version; | ||
| break; | ||
| case CL_PLATFORM_NAME: | ||
| returnString = _platform->name; | ||
| break; | ||
| case CL_PLATFORM_VENDOR: | ||
| returnString = _platform->vendor; | ||
| break; | ||
| case CL_PLATFORM_EXTENSIONS: | ||
| returnString = _platform->extensions; | ||
| break; | ||
| case CL_PLATFORM_ICD_SUFFIX_KHR: | ||
| returnString = _platform->suffix; | ||
| break; | ||
| default: | ||
| ret = CL_INVALID_VALUE; | ||
|
|
@@ -163,7 +163,7 @@ clGetPlatformInfo(cl_platform_id platform, | |
|
|
||
| /* Device APIs */ | ||
| CL_API_ENTRY cl_int CL_API_CALL | ||
| clGetDeviceIDs(cl_platform_id _platform, | ||
| cl_device_type device_type, | ||
| cl_uint num_entries, | ||
| cl_device_id * devices, | ||
|
|
@@ -187,7 +187,7 @@ clGetDeviceIDs(cl_platform_id platform, | |
|
|
||
| done: | ||
| test_icd_stub_log("clGetDeviceIDs(%p, %x, %u, %p, %p)\n", | ||
| _platform, | ||
| device_type, | ||
| num_entries, | ||
| devices, | ||
|
|
@@ -950,10 +950,10 @@ clLinkProgram(cl_context context , | |
|
|
||
|
|
||
| CL_API_ENTRY cl_int CL_API_CALL | ||
| clUnloadPlatformCompiler(cl_platform_id _platform) CL_API_SUFFIX__VERSION_1_2 | ||
| { | ||
| cl_int return_value = CL_OUT_OF_RESOURCES; | ||
| test_icd_stub_log("clUnloadPlatformCompiler(%p)\n", _platform); | ||
| test_icd_stub_log("Value returned: %d\n", return_value); | ||
| return return_value; | ||
| } | ||
|
|
@@ -1836,12 +1836,12 @@ clEnqueueNativeKernel(cl_command_queue command_queue , | |
| } | ||
|
|
||
| CL_API_ENTRY void * CL_API_CALL | ||
| clGetExtensionFunctionAddressForPlatform(cl_platform_id _platform , | ||
| const char * func_name) CL_API_SUFFIX__VERSION_1_2 | ||
| { | ||
| void *return_value = (void *) malloc(sizeof(void *)); | ||
| test_icd_stub_log("clGetExtensionFunctionAddressForPlatform(%p, %p)\n", | ||
| _platform, | ||
| func_name); | ||
|
|
||
| test_icd_stub_log("Value returned: %p\n", return_value); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -5,15 +5,15 @@ | |
| // themselves via the dispatch table. Include this before cl headers. | ||
| #include "rename_api.h" | ||
|
|
||
| #include <limits.h> // SIZE_MAX | ||
|
|
||
| CL_API_ENTRY cl_mem CL_API_CALL | ||
| clCreateFromGLBuffer(cl_context context , | ||
| cl_mem_flags flags , | ||
| cl_GLuint bufret_mem , | ||
| int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 | ||
| { | ||
| cl_mem ret_mem = (cl_mem)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateFromGLBuffer(%p, %x, %u, %p)\n", | ||
| context, | ||
| flags, | ||
|
|
@@ -32,7 +32,7 @@ clCreateFromGLTexture(cl_context context , | |
| cl_GLuint texture , | ||
| cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_2 | ||
| { | ||
| cl_mem ret_mem = (cl_mem)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateFromGLTexture(%p, %x, %d, %d, %u, %p)\n", | ||
| context , | ||
| flags , | ||
|
|
@@ -53,7 +53,7 @@ clCreateFromGLTexture2D(cl_context context, | |
| cl_GLuint texture, | ||
| cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 | ||
| { | ||
| cl_mem ret_mem = (cl_mem)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateFromGLTexture2D(%p, %x, %d, %d, %u, %p)\n", | ||
| context, | ||
| flags, | ||
|
|
@@ -75,7 +75,7 @@ clCreateFromGLTexture3D(cl_context context, | |
| cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 | ||
|
|
||
| { | ||
| cl_mem ret_mem = (cl_mem)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateFromGLTexture3D(%p, %x, %d, %d, %u, %p)\n", | ||
| context, | ||
| flags, | ||
|
|
@@ -94,7 +94,7 @@ clCreateFromGLRenderbuffer(cl_context context, | |
| cl_GLuint renderbuffer, | ||
| cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_0 | ||
| { | ||
| cl_mem ret_mem = (cl_mem)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateFromGLRenderbuffer(%p, %x, %d, %p)\n", | ||
| context, | ||
| flags, | ||
|
|
@@ -209,7 +209,7 @@ clCreateEventFromGLsyncKHR(cl_context context , | |
| cl_int * errcode_ret ) CL_API_SUFFIX__VERSION_1_1 | ||
|
|
||
| { | ||
| cl_event ret_event = (cl_event)(SIZE_MAX); | ||
| test_icd_stub_log("clCreateEventFromGLsyncKHR(%p, %p, %p)\n", | ||
| context, | ||
| cl_GLsync, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -123,7 +123,7 @@ int test_clCompileProgram(const struct clCompileProgram_st *data) | |
|
|
||
| int test_clLinkProgram(const struct clLinkProgram_st *data) | ||
| { | ||
| cl_program _program; | ||
| test_icd_app_log("clLinkProgram(%p, %u, %p, %p, %u, %p, %p, %p, %p)\n", | ||
| context, | ||
| data->num_devices, | ||
|
|
@@ -135,7 +135,7 @@ int test_clLinkProgram(const struct clLinkProgram_st *data) | |
| data->user_data, | ||
| data->errcode_ret); | ||
|
|
||
| _program=clLinkProgram(context, | ||
| data->num_devices, | ||
| data->device_list, | ||
| data->options, | ||
|
|
@@ -145,7 +145,7 @@ int test_clLinkProgram(const struct clLinkProgram_st *data) | |
| data->user_data, | ||
| data->errcode_ret); | ||
|
|
||
| test_icd_app_log("Value returned: %p\n", _program); | ||
|
|
||
| return 0; | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -35,7 +35,9 @@ add_test( | |
| COMMAND ${PROJECT_NAME} | ||
| ) | ||
|
|
||
| if(DRIVER_STUB_PATH) | ||
| set_tests_properties(${PROJECT_NAME} | ||
| PROPERTIES | ||
| ENVIRONMENT "OCL_ICD_FILENAMES=${DRIVER_STUB_PATH}" | ||
| ) | ||
| endif() | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,9 @@ add_test( | |
| COMMAND ${PROJECT_NAME} | ||
| ) | ||
|
|
||
| if(DRIVER_STUB_PATH) | ||
| set_tests_properties(${PROJECT_NAME} | ||
| PROPERTIES | ||
| ENVIRONMENT "OCL_ICD_FILENAMES=${DRIVER_STUB_PATH}" | ||
| ) | ||
| endif() | ||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would use
%"PRIuDW"here instead of%lu.