From d138b87597f6c819953c5caa880b45ea5bd67c20 Mon Sep 17 00:00:00 2001 From: Harald van Dijk Date: Tue, 9 Jul 2024 10:29:34 +0100 Subject: [PATCH] Update OpenCL headers. CL_DEPTH_STENCIL and CL_UNORM_INT24 have been moved into . As these were only used in error reporting and we do not support these in libimg either, just leave them out. --- external/CMakeLists.txt | 2 +- modules/compiler/builtins/libimg/source/host.cpp | 4 ---- source/cl/test/UnitCL/source/Common.cpp | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/external/CMakeLists.txt b/external/CMakeLists.txt index aa94d4bcd..bb24b8392 100644 --- a/external/CMakeLists.txt +++ b/external/CMakeLists.txt @@ -26,7 +26,7 @@ set(CMAKE_CXX_EXTENSIONS ON) FetchContent_Declare( OpenCLHeaders GIT_REPOSITORY https://github.com/KhronosGroup/OpenCL-Headers.git - GIT_TAG 68d98613113259dbcd4c05b2039bb758766bf2ac + GIT_TAG v2024.05.08 ) FetchContent_MakeAvailable(OpenCLHeaders) diff --git a/modules/compiler/builtins/libimg/source/host.cpp b/modules/compiler/builtins/libimg/source/host.cpp index 66f9d8e77..2be44b8ec 100644 --- a/modules/compiler/builtins/libimg/source/host.cpp +++ b/modules/compiler/builtins/libimg/source/host.cpp @@ -441,10 +441,6 @@ cl_int libimg::HostGetSupportedImageFormats(const cl_mem_flags flags, {CL_RGBx, CL_UNORM_SHORT_565}, {CL_RGBx, CL_UNORM_SHORT_555}, {CL_RGBx, CL_UNORM_INT_101010}, - // {CL_DEPTH, CL_UNORM_INT16}, - // {CL_DEPTH, CL_FLOAT}, - // {CL_DEPTH_STENCIL, CL_UNORM_INT24}, - // {CL_DEPTH_STENCIL, CL_FLOAT}, }; const size_t num_formats = sizeof(formats) / sizeof(formats[0]); diff --git a/source/cl/test/UnitCL/source/Common.cpp b/source/cl/test/UnitCL/source/Common.cpp index 4a5bb6429..8dd45d530 100644 --- a/source/cl/test/UnitCL/source/Common.cpp +++ b/source/cl/test/UnitCL/source/Common.cpp @@ -778,7 +778,6 @@ bool UCL::isImageFormatSupported(cl_context context, CASE(CL_RGx); CASE(CL_RGBx); CASE(CL_DEPTH); - CASE(CL_DEPTH_STENCIL); default: return "UNKNOWN CHANNEL ORDER"; } @@ -801,7 +800,6 @@ bool UCL::isImageFormatSupported(cl_context context, CASE(CL_UNSIGNED_INT32); CASE(CL_HALF_FLOAT); CASE(CL_FLOAT); - CASE(CL_UNORM_INT24); default: return "UNKNOWN CHANNEL DATA TYPE"; }