Skip to content

Address anonymous union initialization when extensions are disabled. #257

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Aug 5, 2025
Merged

Address anonymous union initialization when extensions are disabled. #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions loader/icd.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,13 @@ void khrIcdContextPropertiesGetPlatform(
const cl_context_properties *properties,
cl_platform_id *outPlatform);

// condition anonyous union initialization to usage
#if __CL_HAS_ANON_STRUCT__
#define ICD_ANON_UNION_INIT_MEMBER(a) {a}
#else
#define ICD_ANON_UNION_INIT_MEMBER(a) a
#endif

// internal tracing macros
#define KHR_ICD_TRACE(...) \
do \
Expand Down
4 changes: 2 additions & 2 deletions loader/icd_dispatch_generated.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6825,7 +6825,7 @@ static cl_int CL_API_CALL clGetKernelSubGroupInfoKHR_disp(

#if defined(CL_ENABLE_LAYERS)
struct _cl_icd_dispatch khrMasterDispatch = {
{&clGetPlatformIDs_disp},
ICD_ANON_UNION_INIT_MEMBER(&clGetPlatformIDs_disp),
&clGetPlatformInfo_disp,
&clGetDeviceIDs_disp,
&clGetDeviceInfo_disp,
Expand Down Expand Up @@ -6856,7 +6856,7 @@ struct _cl_icd_dispatch khrMasterDispatch = {
&clRetainProgram_disp,
&clReleaseProgram_disp,
&clBuildProgram_disp,
{&clUnloadCompiler_disp},
ICD_ANON_UNION_INIT_MEMBER(&clUnloadCompiler_disp),
&clGetProgramInfo_disp,
&clGetProgramBuildInfo_disp,
&clCreateKernel_disp,
Expand Down
4 changes: 2 additions & 2 deletions scripts/icd_dispatch_generated.c.mako
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ ${("CL_API_ENTRY", "static")[disp]} ${api.RetType} CL_API_CALL ${api.Name + ("",
%endfor
#if defined(CL_ENABLE_LAYERS)
struct _cl_icd_dispatch khrMasterDispatch = {
{&clGetPlatformIDs_disp},
ICD_ANON_UNION_INIT_MEMBER(&clGetPlatformIDs_disp),
&clGetPlatformInfo_disp,
&clGetDeviceIDs_disp,
&clGetDeviceInfo_disp,
Expand Down Expand Up @@ -311,7 +311,7 @@ struct _cl_icd_dispatch khrMasterDispatch = {
&clRetainProgram_disp,
&clReleaseProgram_disp,
&clBuildProgram_disp,
{&clUnloadCompiler_disp},
ICD_ANON_UNION_INIT_MEMBER(&clUnloadCompiler_disp),
&clGetProgramInfo_disp,
&clGetProgramBuildInfo_disp,
&clCreateKernel_disp,
Expand Down
Loading