diff --git a/CMakeLists.txt b/CMakeLists.txt index a995094f3..556ae3773 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2099,8 +2099,6 @@ if(ENABLE_OPENCL) if(NOT OPENCL_FOUND) message(STATUS "Processing blocks using OpenCL will not be built.") endif() -else() - set(OPENCL_FOUND FALSE) endif() @@ -2114,13 +2112,33 @@ if(DEFINED ENV{CUDA_GPU_ACCEL}) endif() if(ENABLE_CUDA) - find_package(CUDA REQUIRED) - set_package_properties(CUDA PROPERTIES - URL "https://developer.nvidia.com/cuda-downloads" - DESCRIPTION "Library for parallel programming in Nvidia GPUs" - PURPOSE "Used in some processing block implementations." - TYPE REQUIRED - ) + if(CMAKE_VERSION VERSION_GREATER 3.11) + include(CheckLanguage) + check_language(CUDA) + if(CMAKE_CUDA_COMPILER) + enable_language(CUDA) + set(CUDA_FOUND TRUE) + if(NOT DEFINED CMAKE_CUDA_STANDARD) + set(CMAKE_CUDA_STANDARD 11) + set(CMAKE_CUDA_STANDARD_REQUIRED ON) + endif() + else() + set(ENABLE_CUDA OFF) + endif() + else() + find_package(CUDA REQUIRED) + set_package_properties(CUDA PROPERTIES + URL "https://developer.nvidia.com/cuda-downloads" + DESCRIPTION "Library for parallel programming in Nvidia GPUs" + PURPOSE "Used in some processing block implementations." + TYPE REQUIRED + ) + if(NOT CUDA_FOUND) + set(ENABLE_CUDA OFF) + endif() + endif() +endif() +if(ENABLE_CUDA) message(STATUS "NVIDIA CUDA GPU Acceleration will be enabled.") message(STATUS " You can disable it with 'cmake -DENABLE_CUDA=OFF ..'") else() @@ -2242,7 +2260,6 @@ else() endif() find_package(TELEORBIT) set_package_properties(TELEORBIT PROPERTIES - DESCRIPTION "The Teleorbit's Flexiband GNU Radio block." PURPOSE "Used for communication with the Flexiband front-end." TYPE OPTIONAL ) diff --git a/cmake/Modules/FindLOG4CPP.cmake b/cmake/Modules/FindLOG4CPP.cmake index 81de00826..fdc1acd27 100644 --- a/cmake/Modules/FindLOG4CPP.cmake +++ b/cmake/Modules/FindLOG4CPP.cmake @@ -30,6 +30,10 @@ if(NOT COMMAND feature_summary) include(FeatureSummary) endif() +set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) +include(FindPkgConfig) +pkg_check_modules(PC_LOG4CPP log4cpp QUIET) + if(LOG4CPP_INCLUDE_DIR) # Already in cache, be silent set(LOG4CPP_FIND_QUIETLY TRUE) @@ -41,6 +45,7 @@ find_path(LOG4CPP_INCLUDE_DIR log4cpp/Category.hh /usr/include ${LOG4CPP_ROOT}/include $ENV{LOG4CPP_ROOT}/include + ${PC_LOG4CPP_INCLUDEDIR} ) if(LOG4CPP_INCLUDE_DIR) @@ -61,7 +66,7 @@ set(LOG4CPP_NAMES log4cpp) find_library(LOG4CPP_LIBRARY NAMES ${LOG4CPP_NAMES} HINTS $ENV{GNURADIO_RUNTIME_DIR}/lib - ${PC_LIBDIR} + ${PC_LOG4CPP_LIBDIR} ${CMAKE_INSTALL_PREFIX}/lib/ PATHS /usr/local/lib /usr/lib/x86_64-linux-gnu @@ -115,13 +120,23 @@ set_package_properties(LOG4CPP PROPERTIES URL "http://log4cpp.sourceforge.net/" ) -if(LOG4CPP_FOUND AND LOG4CPP_READY_FOR_CXX17) - set_package_properties(LOG4CPP PROPERTIES - DESCRIPTION "Library of C++ classes for flexible logging to files (the version found is C++17-ready)" - ) +if(LOG4CPP_FOUND AND PC_LOG4CPP_VERSION) + set(LOG4CPP_VERSION ${PC_LOG4CPP_VERSION}) +endif() + +if(LOG4CPP_FOUND AND LOG4CPP_VERSION) + if(LOG4CPP_READY_FOR_CXX17) + set_package_properties(LOG4CPP PROPERTIES + DESCRIPTION "Library of C++ classes for flexible logging (found: v${LOG4CPP_VERSION}, C++17-ready)" + ) + else() + set_package_properties(LOG4CPP PROPERTIES + DESCRIPTION "Library of C++ classes for flexible logging (found: v${LOG4CPP_VERSION})" + ) + endif() else() set_package_properties(LOG4CPP PROPERTIES - DESCRIPTION "Library of C++ classes for flexible logging to files" + DESCRIPTION "Library of C++ classes for flexible logging" ) endif() diff --git a/cmake/Modules/FindMATIO.cmake b/cmake/Modules/FindMATIO.cmake index da4a2b017..cb0d0ff96 100644 --- a/cmake/Modules/FindMATIO.cmake +++ b/cmake/Modules/FindMATIO.cmake @@ -104,7 +104,6 @@ if(MATIO_INCLUDE_DIR) endif() if(MATIO_CONFIG_FILE) - # Read and parse MATIO config header file for version number file(STRINGS "${MATIO_INCLUDE_DIR}/${MATIO_CONFIG_FILE}" _matio_HEADER_CONTENTS REGEX "#define MATIO_((MAJOR|MINOR)_VERSION)|(RELEASE_LEVEL) ") diff --git a/cmake/Modules/FindOPENCL.cmake b/cmake/Modules/FindOPENCL.cmake index 61e43799d..09a6fa359 100644 --- a/cmake/Modules/FindOPENCL.cmake +++ b/cmake/Modules/FindOPENCL.cmake @@ -1,4 +1,4 @@ -# Copyright (C) 2011-2018 (see AUTHORS file for a list of contributors) +# Copyright (C) 2011-2019 (see AUTHORS file for a list of contributors) # # This file is part of GNSS-SDR. # @@ -20,7 +20,7 @@ # # - Try to find OpenCL # This module tries to find an OpenCL implementation on your system. It supports -# AMD / ATI, Apple and NVIDIA implementations, but shoudl work, too. +# AMD / ATI, Apple and NVIDIA implementations. # # Once done this will define # OPENCL_FOUND - system has OpenCL @@ -35,85 +35,189 @@ endif() include(FindPackageHandleStandardArgs) -set(OPENCL_VERSION_STRING "0.1.0") -set(OPENCL_VERSION_MAJOR 0) -set(OPENCL_VERSION_MINOR 1) -set(OPENCL_VERSION_PATCH 0) +function(_FIND_OPENCL_VERSION) + include(CheckSymbolExists) + include(CMakePushCheckState) + set(CMAKE_REQUIRED_QUIET ${OPENCL_FIND_QUIETLY}) -if(APPLE) - find_library(OPENCL_LIBRARIES OpenCL DOC "OpenCL lib for OSX") - find_path(OPENCL_INCLUDE_DIRS OpenCL/cl.h DOC "Include for OpenCL on OSX") - find_path(_OPENCL_CPP_INCLUDE_DIRS OpenCL/cl.hpp DOC "Include for OpenCL CPP bindings on OSX") + cmake_push_check_state() + foreach(VERSION "2_2" "2_1" "2_0" "1_2" "1_1" "1_0") + set(CMAKE_REQUIRED_INCLUDES "${OPENCL_INCLUDE_DIR}") -else() - if(WIN32) - find_path(OPENCL_INCLUDE_DIRS CL/cl.h) - find_path(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp) + if(APPLE) + check_symbol_exists( + CL_VERSION_${VERSION} + "${OPENCL_INCLUDE_DIR}/Headers/cl.h" + OPENCL_VERSION_${VERSION} + ) + else() + check_symbol_exists( + CL_VERSION_${VERSION} + "${OPENCL_INCLUDE_DIR}/CL/cl.h" + OPENCL_VERSION_${VERSION} + ) + endif() - # The AMD SDK currently installs both x86 and x86_64 libraries - # This is only a hack to find out architecture - if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") - set(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86_64") - set(OPENCL_LIB_DIR "$ENV{ATIINTERNALSTREAMSDKROOT}/lib/x86_64") - else() - set(OPENCL_LIB_DIR "$ENV{ATISTREAMSDKROOT}/lib/x86") - set(OPENCL_LIB_DIR "$ENV{ATIINTERNALSTREAMSDKROOT}/lib/x86") - endif() + if(OPENCL_VERSION_${VERSION}) + string(REPLACE "_" "." VERSION "${VERSION}") + set(OPENCL_VERSION_STRING ${VERSION} PARENT_SCOPE) + string(REGEX MATCHALL "[0-9]+" version_components "${VERSION}") + list(GET version_components 0 major_version) + list(GET version_components 1 minor_version) + set(OPENCL_VERSION_MAJOR ${major_version} PARENT_SCOPE) + set(OPENCL_VERSION_MINOR ${minor_version} PARENT_SCOPE) + break() + endif() + endforeach() + cmake_pop_check_state() +endfunction() - # find out if the user asked for a 64-bit build, and use the corresponding - # 64 or 32 bit NVIDIA library paths to the search: - string(REGEX MATCH "Win64" ISWIN64 ${CMAKE_GENERATOR}) - if("${ISWIN64}" STREQUAL "Win64") - find_library(OPENCL_LIBRARIES OpenCL.lib ${OPENCL_LIB_DIR} $ENV{CUDA_LIB_PATH} $ENV{CUDA_PATH}/lib/x64) - else() - find_library(OPENCL_LIBRARIES OpenCL.lib ${OPENCL_LIB_DIR} $ENV{CUDA_LIB_PATH} $ENV{CUDA_PATH}/lib/Win32) - endif() +find_path(OPENCL_INCLUDE_DIR + NAMES + CL/cl.h OpenCL/cl.h + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV NVSDKCOMPUTE_ROOT + ENV CUDA_PATH + ENV ATISTREAMSDKROOT + ENV OCL_ROOT + /usr/local/cuda/include + PATH_SUFFIXES + include + OpenCL/common/inc + "AMD APP/include" +) - get_filename_component(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE) +find_path(_OPENCL_CPP_INCLUDE_DIRS + NAMES + CL/cl.hpp OpenCL/cl.hpp + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV NVSDKCOMPUTE_ROOT + ENV CUDA_PATH + ENV ATISTREAMSDKROOT + ENV OCL_ROOT + /usr/local/cuda/include + PATH_SUFFIXES + include + OpenCL/common/inc + "AMD APP/include" +) - # On Win32 search relative to the library - find_path(OPENCL_INCLUDE_DIRS CL/cl.h PATHS "${_OPENCL_INC_CAND}" $ENV{CUDA_INC_PATH} $ENV{CUDA_PATH}/include) - find_path(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS "${_OPENCL_INC_CAND}" $ENV{CUDA_INC_PATH} $ENV{CUDA_PATH}/include) - - else() - # Unix style platforms - find_library(OPENCL_LIBRARIES OpenCL - ENV LD_LIBRARY_PATH - ) - - get_filename_component(OPENCL_LIB_DIR ${OPENCL_LIBRARIES} PATH) - get_filename_component(_OPENCL_INC_CAND ${OPENCL_LIB_DIR}/../../include ABSOLUTE) - - # The AMD SDK currently does not place its headers - # in /usr/include, therefore also search relative - # to the library - find_path(OPENCL_INCLUDE_DIRS CL/cl.h PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include") - find_path(_OPENCL_CPP_INCLUDE_DIRS CL/cl.hpp PATHS ${_OPENCL_INC_CAND} "/usr/local/cuda/include") - endif() +set(OPENCL_INCLUDE_DIRS ${OPENCL_INCLUDE_DIR}) +if(_OPENCL_CPP_INCLUDE_DIRS) + set(OPENCL_HAS_CPP_BINDINGS TRUE) + list(APPEND OPENCL_INCLUDE_DIRS ${_OPENCL_CPP_INCLUDE_DIRS}) + # This is often the same, so clean up + list(REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS) endif() +_FIND_OPENCL_VERSION() + +if(WIN32) + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + find_library(OPENCL_LIBRARY + NAMES OpenCL + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV CUDA_PATH + ENV NVSDKCOMPUTE_ROOT + ENV ATISTREAMSDKROOT + ENV OCL_ROOT + PATH_SUFFIXES + "AMD APP/lib/x86" + lib/x86 + lib/Win32 + OpenCL/common/lib/Win32 + ) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) + find_library(OPENCL_LIBRARY + NAMES OpenCL + PATHS + ENV "PROGRAMFILES(X86)" + ENV AMDAPPSDKROOT + ENV INTELOCLSDKROOT + ENV CUDA_PATH + ENV NVSDKCOMPUTE_ROOT + ENV ATISTREAMSDKROOT + ENV OCL_ROOT + PATH_SUFFIXES + "AMD APP/lib/x86_64" + lib/x86_64 + lib/x64 + OpenCL/common/lib/x64 + ) + endif() +else() + if(CMAKE_SIZEOF_VOID_P EQUAL 4) + find_library(OPENCL_LIBRARY + NAMES OpenCL + PATHS + ENV AMDAPPSDKROOT + ENV CUDA_PATH + ENV LD_LIBRARY_PATH + PATH_SUFFIXES + lib/x86 + lib + ) + elseif(CMAKE_SIZEOF_VOID_P EQUAL 8) + find_library(OPENCL_LIBRARY + NAMES OpenCL + PATHS + ENV AMDAPPSDKROOT + ENV CUDA_PATH + ENV LD_LIBRARY_PATH + PATH_SUFFIXES + lib/x86_64 + lib/x64 + lib + lib64 + ) + endif() +endif() + +set(OPENCL_LIBRARIES ${OPENCL_LIBRARY}) + find_package_handle_standard_args(OPENCL DEFAULT_MSG OPENCL_LIBRARIES OPENCL_INCLUDE_DIRS) -if(_OPENCL_CPP_INCLUDE_DIRS) - set(OPENCL_HAS_CPP_BINDINGS TRUE) - list(APPEND OPENCL_INCLUDE_DIRS ${_OPENCL_CPP_INCLUDE_DIRS}) - # This is often the same, so clean up - list(REMOVE_DUPLICATES OPENCL_INCLUDE_DIRS) -endif() - mark_as_advanced( OPENCL_INCLUDE_DIRS + OPENCL_LIBRARIES ) set_package_properties(OPENCL PROPERTIES URL "https://www.khronos.org/opencl/" - DESCRIPTION "Library for parallel programming" ) -if(OPENCL_INCLUDE_DIRS AND OPENCL_LIBRARIES) - set( OPENCL_FOUND TRUE ) - add_definitions( -DOPENCL=1 ) +if(OPENCL_FOUND AND OPENCL_VERSION_STRING) + set_package_properties(OPENCL PROPERTIES + DESCRIPTION "Library for parallel programming (found: v${OPENCL_VERSION_STRING})" + ) else() - set( OPENCL_FOUND FALSE ) - add_definitions( -DOPENCL=0 ) + set_package_properties(OPENCL PROPERTIES + DESCRIPTION "Library for parallel programming" + ) +endif() + +if(OPENCL_FOUND AND NOT TARGET OpenCL::OpenCL) + if(OPENCL_LIBRARY MATCHES "/([^/]+)\\.framework$") + add_library(OpenCL::OpenCL INTERFACE IMPORTED) + set_target_properties(OpenCL::OpenCL PROPERTIES + INTERFACE_LINK_LIBRARIES "${OPENCL_LIBRARY}" + ) + else() + add_library(OpenCL::OpenCL UNKNOWN IMPORTED) + set_target_properties(OpenCL::OpenCL PROPERTIES + IMPORTED_LOCATION "${OPENCL_LIBRARY}" + ) + endif() + set_target_properties(OpenCL::OpenCL PROPERTIES + INTERFACE_INCLUDE_DIRECTORIES "${OPENCL_INCLUDE_DIRS}" + ) endif() diff --git a/cmake/Modules/FindPCAP.cmake b/cmake/Modules/FindPCAP.cmake index 880df6869..56260dacc 100644 --- a/cmake/Modules/FindPCAP.cmake +++ b/cmake/Modules/FindPCAP.cmake @@ -54,7 +54,7 @@ endif() set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) -pkg_check_modules(PC_PCAP libpcap) +pkg_check_modules(PC_PCAP libpcap QUIET) if(EXISTS $ENV{PCAPDIR}) find_path(PCAP_INCLUDE_DIR diff --git a/cmake/Modules/FindPUGIXML.cmake b/cmake/Modules/FindPUGIXML.cmake index bf66cfe86..98e63c0c6 100644 --- a/cmake/Modules/FindPUGIXML.cmake +++ b/cmake/Modules/FindPUGIXML.cmake @@ -41,11 +41,14 @@ find_path(PUGIXML_INCLUDE_DIR /usr/include /usr/local/include /usr/local/include/pugixml-1.9 + /usr/local/include/pugixml-${PC_PUGIXML_VERSION} /opt/local/include ${PUGIXML_ROOT}/include $ENV{PUGIXML_ROOT}/include ${PUGIXML_ROOT}/include/pugixml-1.9 $ENV{PUGIXML_ROOT}/include/pugixml-1.9 + ${PUGIXML_ROOT}/include/pugixml-${PC_PUGIXML_VERSION} + $ENV{PUGIXML_ROOT}/include/pugixml-${PC_PUGIXML_VERSION} ${PC_PUGIXML_INCLUDEDIR} ) @@ -64,6 +67,7 @@ find_library(PUGIXML_LIBRARY /usr/lib/s390x-linux-gnu /usr/local/lib /usr/local/lib/pugixml-1.9 + /usr/local/lib/pugixml-${PC_PUGIXML_VERSION} /opt/local/lib /usr/lib /usr/lib64 @@ -76,6 +80,10 @@ find_library(PUGIXML_LIBRARY $ENV{PUGIXML_ROOT}/lib/pugixml-1.9 ${PUGIXML_ROOT}/lib64/pugixml-1.9 $ENV{PUGIXML_ROOT}/lib64/pugixml-1.9 + ${PUGIXML_ROOT}/lib/pugixml-${PC_PUGIXML_VERSION} + $ENV{PUGIXML_ROOT}/lib/pugixml-${PC_PUGIXML_VERSION} + ${PUGIXML_ROOT}/lib64/pugixml-${PC_PUGIXML_VERSION} + $ENV{PUGIXML_ROOT}/lib64/pugixml-${PC_PUGIXML_VERSION} ${PC_PUGIXML_LIBDIR} ) diff --git a/cmake/Modules/FindTELEORBIT.cmake b/cmake/Modules/FindTELEORBIT.cmake index a99cab845..cc33ac87b 100644 --- a/cmake/Modules/FindTELEORBIT.cmake +++ b/cmake/Modules/FindTELEORBIT.cmake @@ -15,9 +15,13 @@ # You should have received a copy of the GNU General Public License # along with GNSS-SDR. If not, see . +if(NOT COMMAND feature_summary) + include(FeatureSummary) +endif() + set(PKG_CONFIG_USE_CMAKE_PREFIX_PATH TRUE) include(FindPkgConfig) -pkg_check_modules(PC_TELEORBIT teleorbit) +pkg_check_modules(PC_TELEORBIT teleorbit QUIET) find_path(TELEORBIT_INCLUDE_DIRS NAMES teleorbit/api.h @@ -26,6 +30,7 @@ find_path(TELEORBIT_INCLUDE_DIRS PATHS ${CMAKE_INSTALL_PREFIX}/include /usr/local/include /usr/include + /opt/local/include ${TELEORBIT_ROOT}/include $ENV{TELEORBIT_ROOT}/include ) @@ -40,6 +45,7 @@ find_library(TELEORBIT_LIBRARIES /usr/local/lib64 /usr/lib /usr/lib64 + /opt/local/lib ${TELEORBIT_ROOT}/lib $ENV{TELEORBIT_ROOT}/lib ${TELEORBIT_ROOT}/lib64 @@ -49,6 +55,32 @@ find_library(TELEORBIT_LIBRARIES include(FindPackageHandleStandardArgs) find_package_handle_standard_args(TELEORBIT DEFAULT_MSG TELEORBIT_LIBRARIES TELEORBIT_INCLUDE_DIRS) +if(PC_TELEORBIT_VERSION) + set(TELEORBIT_VERSION ${PC_TELEORBIT_VERSION}) +endif() + +if(NOT TELEORBIT_VERSION) + list(GET TELEORBIT_LIBRARIES 0 FIRST_DIR) + get_filename_component(TELEORBIT_LIBRARIES_DIR ${FIRST_DIR} DIRECTORY) + if(EXISTS ${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake) + include(${TELEORBIT_LIBRARIES_DIR}/cmake/teleorbit/TeleorbitConfigVersion.cmake) + endif() + if(PACKAGE_VERSION) + set(TELEORBIT_VERSION ${PACKAGE_VERSION}) + endif() + unset(PACKAGE_VERSION) +endif() + +if(TELEORBIT_FOUND AND TELEORBIT_VERSION) + set_package_properties(TELEORBIT PROPERTIES + DESCRIPTION "The Teleorbit's Flexiband GNU Radio block (found: v${TELEORBIT_VERSION})" + ) +else() + set_package_properties(TELEORBIT PROPERTIES + DESCRIPTION "The Teleorbit's Flexiband GNU Radio block." + ) +endif() + if(TELEORBIT_FOUND AND NOT TARGET Gnuradio::teleorbit) add_library(Gnuradio::teleorbit SHARED IMPORTED) set_target_properties(Gnuradio::teleorbit PROPERTIES diff --git a/cmake/Modules/FindVOLKGNSSSDR.cmake b/cmake/Modules/FindVOLKGNSSSDR.cmake index be5d76d7f..d7e5822d6 100644 --- a/cmake/Modules/FindVOLKGNSSSDR.cmake +++ b/cmake/Modules/FindVOLKGNSSSDR.cmake @@ -62,10 +62,19 @@ include(FindPackageHandleStandardArgs) find_package_handle_standard_args(VOLKGNSSSDR DEFAULT_MSG VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS) mark_as_advanced(VOLK_GNSSSDR_LIBRARIES VOLK_GNSSSDR_INCLUDE_DIRS) -set_package_properties(VOLKGNSSSDR PROPERTIES - DESCRIPTION "Vector-Optimized Library of Kernels for GNSS-SDR." -) +if(PC_VOLK_GNSSSDR_VERSION) + set(VOLKGNSSSDR_VERSION ${PC_VOLK_GNSSSDR_VERSION}) +endif() +if(VOLKGNSSSDR_FOUND AND VOLKGNSSSDR_VERSION) + set_package_properties(VOLKGNSSSDR PROPERTIES + DESCRIPTION "Vector-Optimized Library of Kernels for GNSS-SDR (found: v${VOLKGNSSSDR_VERSION})." + ) +else() + set_package_properties(VOLKGNSSSDR PROPERTIES + DESCRIPTION "Vector-Optimized Library of Kernels for GNSS-SDR." + ) +endif() if(VOLKGNSSSDR_FOUND AND NOT TARGET Volkgnsssdr::volkgnsssdr) add_library(Volkgnsssdr::volkgnsssdr SHARED IMPORTED) diff --git a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h index cb481fb46..350589f17 100644 --- a/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h +++ b/src/algorithms/acquisition/adapters/gps_l1_ca_pcps_opencl_acquisition.h @@ -144,6 +144,12 @@ public: void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; + inline bool opencl_ready() const + { + bool ready = this->acquisition_cc_->opencl_ready(); + return ready; + } + private: ConfigurationInterface* configuration_; pcps_opencl_acquisition_cc_sptr acquisition_cc_; diff --git a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt index 79d6eeb64..39caeb02c 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/acquisition/gnuradio_blocks/CMakeLists.txt @@ -49,16 +49,6 @@ if(OPENCL_FOUND) set(ACQ_GR_BLOCKS_HEADERS ${ACQ_GR_BLOCKS_HEADERS} pcps_opencl_acquisition_cc.h) endif() - -if(OPENCL_FOUND) - include_directories(${OPENCL_INCLUDE_DIRS}) - if(OS_IS_MACOSX) - set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") - else() - set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) - endif() -endif() - list(SORT ACQ_GR_BLOCKS_HEADERS) list(SORT ACQ_GR_BLOCKS_SOURCES) @@ -78,19 +68,19 @@ endif() target_link_libraries(acquisition_gr_blocks PUBLIC + algorithms_libs Gnuradio::runtime Gnuradio::fft Volk::volk channel_libs acquisition_libs core_system_parameters - ${OPT_LIBRARIES} PRIVATE Gflags::gflags Glog::glog Matio::matio Volkgnsssdr::volkgnsssdr - algorithms_libs + ) target_include_directories(acquisition_gr_blocks @@ -101,7 +91,11 @@ target_include_directories(acquisition_gr_blocks ) if(OPENCL_FOUND) - target_include_directories(acquisition_gr_blocks PUBLIC ${OPENCL_INCLUDE_DIRS}) + target_link_libraries(acquisition_gr_blocks PUBLIC OpenCL::OpenCL) + target_include_directories(acquisition_gr_blocks + PUBLIC + ${CMAKE_SOURCE_DIR}/src/algorithms/libs/opencl + ) endif() if(ENABLE_CLANG_TIDY) @@ -116,4 +110,5 @@ endif() set_property(TARGET acquisition_gr_blocks APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $ + $ ) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc index beb3d74d1..1e8eef7c5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.cc @@ -209,7 +209,7 @@ int pcps_opencl_acquisition_cc::init_opencl_environment(const std::string &kerne std::vector all_platforms; cl::Platform::get(&all_platforms); - if (all_platforms.size() == 0) + if (all_platforms.empty()) { std::cout << "No OpenCL platforms found. Check OpenCL installation!" << std::endl; return 1; @@ -223,7 +223,7 @@ int pcps_opencl_acquisition_cc::init_opencl_environment(const std::string &kerne std::vector gpu_devices; d_cl_platform.getDevices(CL_DEVICE_TYPE_GPU, &gpu_devices); - if (gpu_devices.size() == 0) + if (gpu_devices.empty()) { std::cout << "No GPU devices found. Check OpenCL installation!" << std::endl; return 2; diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h index 71501400c..919881c92 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -51,8 +51,10 @@ #ifndef GNSS_SDR_PCPS_OPENCL_ACQUISITION_CC_H_ #define GNSS_SDR_PCPS_OPENCL_ACQUISITION_CC_H_ +#define CL_SILENCE_DEPRECATION #include "channel_fsm.h" #include "gnss_synchro.h" +#include "opencl/cl.hpp" #include "opencl/fft_internal.h" #include #include @@ -62,12 +64,6 @@ #include #include -#ifdef __APPLE__ -#include "opencl/cl.hpp" -#else -#include -#endif - class pcps_opencl_acquisition_cc; typedef boost::shared_ptr pcps_opencl_acquisition_cc_sptr; @@ -226,7 +222,6 @@ public: d_channel = channel; } - /*! * \brief Set channel fsm associated to this acquisition instance */ @@ -262,6 +257,16 @@ public: d_doppler_step = doppler_step; } + inline bool opencl_ready() const + { + bool ready = false; + if (d_opencl == 0) + { + ready = true; + } + return ready; + } + /*! * \brief Parallel Code Phase Search Acquisition signal processing. */ diff --git a/src/algorithms/libs/CMakeLists.txt b/src/algorithms/libs/CMakeLists.txt index c00cb1081..ca41943fb 100644 --- a/src/algorithms/libs/CMakeLists.txt +++ b/src/algorithms/libs/CMakeLists.txt @@ -73,12 +73,6 @@ if(OPENCL_FOUND) opencl/fft_setup.cc # Needs OpenCL opencl/fft_kernelstring.cc # Needs OpenCL ) - include_directories(${OPENCL_INCLUDE_DIRS}) - if(OS_IS_MACOSX) - set(OPT_LIBRARIES ${OPT_LIBRARIES} "-framework OpenCL") - else() - set(OPT_LIBRARIES ${OPT_LIBRARIES} ${OPENCL_LIBRARIES}) - endif() endif() list(SORT GNSS_SPLIBS_HEADERS) @@ -105,7 +99,6 @@ target_link_libraries(algorithms_libs Gflags::gflags Gnuradio::runtime Gnuradio::blocks - ${OPT_LIBRARIES} PRIVATE core_system_parameters Volk::volk ${ORC_LIBRARIES} @@ -113,6 +106,13 @@ target_link_libraries(algorithms_libs Glog::glog ) +if(OPENCL_FOUND) + target_link_libraries(algorithms_libs PUBLIC OpenCL::OpenCL) + target_include_directories(algorithms_libs PUBLIC + $ -#include #include -#include -#if defined(__CL_ENABLE_EXCEPTIONS) -#include -#endif // #if defined(__CL_ENABLE_EXCEPTIONS) - -#pragma push_macro("max") -#undef max #if defined(USE_DX_INTEROP) #include #include #endif #endif // _WIN32 +#if defined(_MSC_VER) +#include +#endif // _MSC_VER + // #if defined(USE_CL_DEVICE_FISSION) #include #endif #if defined(__APPLE__) || defined(__MACOSX) +#define CL_SILENCE_DEPRECATION #include -#include -#include #else #include -#include #endif // !__APPLE__ +#if (_MSC_VER >= 1700) || (__cplusplus >= 201103L) +#define CL_HPP_RVALUE_REFERENCES_SUPPORTED +#define CL_HPP_CPP11_ATOMICS_SUPPORTED +#include +#endif + +#if (__cplusplus >= 201103L) +#define CL_HPP_NOEXCEPT noexcept +#else +#define CL_HPP_NOEXCEPT +#endif + + // To avoid accidentally taking ownership of core OpenCL types // such as cl_kernel constructors are made explicit // under OpenCL 1.2 @@ -199,9 +206,14 @@ #define CL_CALLBACK #endif //CL_CALLBACK +#include #include #include +#if defined(__CL_ENABLE_EXCEPTIONS) +#include +#endif // #if defined(__CL_ENABLE_EXCEPTIONS) + #if !defined(__NO_STD_VECTOR) #include #endif @@ -210,10 +222,8 @@ #include #endif -#if defined(linux) || defined(__APPLE__) || defined(__MACOSX) +#if defined(__ANDROID__) || defined(linux) || defined(__APPLE__) || defined(__MACOSX) #include -#include -#include #endif // linux #include @@ -283,7 +293,7 @@ public: * handling of the exception has concluded. If set, it * will be returned by what(). */ - Error(cl_int err, const char* errStr = NULL) : err_(err), errStr_(errStr) + Error(cl_int err, const char* errStr = nullptr) : err_(err), errStr_(errStr) { } @@ -295,7 +305,7 @@ public: */ virtual const char* what() const throw() { - if (errStr_ == NULL) + if (errStr_ == nullptr) { return "empty"; } @@ -314,7 +324,7 @@ public: #define __ERR_STR(x) #x #else -#define __ERR_STR(x) NULL +#define __ERR_STR(x) nullptr #endif // __CL_ENABLE_EXCEPTIONS @@ -323,7 +333,7 @@ namespace detail #if defined(__CL_ENABLE_EXCEPTIONS) static inline cl_int errHandler( cl_int err, - const char* errStr = NULL) + const char* errStr = nullptr) { if (err != CL_SUCCESS) { @@ -332,7 +342,7 @@ static inline cl_int errHandler( return err; } #else -static inline cl_int errHandler(cl_int err, const char* errStr = NULL) +static inline cl_int errHandler(cl_int err, const char* errStr = nullptr) { (void)errStr; // suppress unused variable warning return err; @@ -395,7 +405,7 @@ static inline cl_int errHandler(cl_int err, const char* errStr = NULL) #define __BUILD_PROGRAM_ERR __ERR_STR(clBuildProgram) #if defined(CL_VERSION_1_2) #define __COMPILE_PROGRAM_ERR __ERR_STR(clCompileProgram) - +#define __LINK_PROGRAM_ERR __ERR_STR(clLinkProgram) #endif // #if defined(CL_VERSION_1_2) #define __CREATE_KERNELS_IN_PROGRAM_ERR __ERR_STR(clCreateKernelsInProgram) @@ -488,7 +498,7 @@ private: public: //! \brief Constructs an empty string, allocating no memory. - string(void) : size_(0), str_(NULL) + string(void) : size_(0), str_(nullptr) { } @@ -498,18 +508,18 @@ public: * An extra '\0' is added, in case none was contained in str. * * \param str the initial value of the string instance. Note that '\0' - * characters receive no special treatment. If NULL, + * characters receive no special treatment. If nullptr, * the string is left empty, with a size of 0. * * \param size the number of characters to copy from str. */ string(const char* str, ::size_t size) : size_(size), - str_(NULL) + str_(nullptr) { if (size > 0) { str_ = new char[size_ + 1]; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, str, size_ * sizeof(char)); str_[size_] = '\0'; @@ -524,10 +534,10 @@ public: /*! \brief Constructs a string populated from a null-terminated value. * * \param str the null-terminated initial value of the string instance. - * If NULL, the string is left empty, with a size of 0. + * If nullptr, the string is left empty, with a size of 0. */ string(const char* str) : size_(0), - str_(NULL) + str_(nullptr) { if (str) { @@ -536,7 +546,7 @@ public: if (size_ > 0) { str_ = new char[size_ + 1]; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, str, (size_ + 1) * sizeof(char)); } @@ -555,13 +565,13 @@ public: { delete[] str_; } - str_ = NULL; + str_ = nullptr; size_ = 0; } else { char* newString = new char[n + 1]; - int copySize = n; + ::size_t copySize = n; if (size_ < n) { copySize = size_; @@ -606,16 +616,16 @@ public: return *this; } - if (str_ != NULL) + if (str_ != nullptr) { delete[] str_; - str_ = NULL; + str_ = nullptr; size_ = 0; } - if (rhs.size_ == 0 || rhs.str_ == NULL) + if (rhs.size_ == 0 || rhs.str_ == nullptr) { - str_ = NULL; + str_ = nullptr; size_ = 0; } else @@ -623,7 +633,7 @@ public: str_ = new char[rhs.size_ + 1]; size_ = rhs.size_; - if (str_ != NULL) + if (str_ != nullptr) { memcpy(str_, rhs.str_, (size_ + 1) * sizeof(char)); } @@ -641,7 +651,7 @@ public: * \param rhs the string to copy. */ string(const string& rhs) : size_(0), - str_(NULL) + str_(nullptr) { *this = rhs; } @@ -650,7 +660,7 @@ public: ~string() { delete[] str_; - str_ = NULL; + str_ = nullptr; } //! \brief Queries the length of the string, excluding any added '\0's. @@ -699,7 +709,7 @@ typedef cl::string STRING_CLASS; * \param N maximum size of the vector. */ template -class CL_EXT_PREFIX__VERSION_1_1_DEPRECATED vector CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED +class CL_EXT_PREFIX__VERSION_1_1_DEPRECATED vector { private: T data_[N]; @@ -867,6 +877,28 @@ public: return N; } + //! \brief Resizes the vector to the given size + void resize(unsigned int newSize, T fill = T()) + { + if (newSize > N) + { + detail::errHandler(CL_MEM_OBJECT_ALLOCATION_FAILURE, __VECTOR_CAPACITY_ERR); + } + else + { + while (size_ < newSize) + { + new (&data_[size_]) T(fill); + size_++; + } + while (size_ > newSize) + { + --size_; + data_[size_].~T(); + } + } + } + /*! \brief Returns a reference to a given element. * * \param index which element to access. * @@ -937,7 +969,7 @@ public: public: iterator(void) : index_(-1), - vec_(NULL) + vec_(nullptr) { } @@ -1044,7 +1076,7 @@ public: { return data_[size_ - 1]; } -}; +} CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED; #endif // #if !defined(__USE_DEV_VECTOR) && !defined(__NO_STD_VECTOR) @@ -1057,25 +1089,40 @@ namespace detail /* * Compare and exchange primitives are needed for handling of defaults */ + +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED +inline int compare_exchange(std::atomic* dest, int exchange, int comparand) +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED inline int compare_exchange(volatile int* dest, int exchange, int comparand) +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED { -#ifdef _WIN32 - return (int)(InterlockedCompareExchange( +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED + std::atomic_compare_exchange_strong(dest, &comparand, exchange); + return comparand; +#elif _MSC_VER + return (int)(_InterlockedCompareExchange( (volatile long*)dest, (long)exchange, (long)comparand)); -#elif defined(__APPLE__) || defined(__MACOSX) - return OSAtomicOr32Orig((uint32_t)exchange, (volatile uint32_t*)dest); -#else // !_WIN32 || defined(__APPLE__) || defined(__MACOSX) +#else // !_MSC_VER && !CL_HPP_CPP11_ATOMICS_SUPPORTED return (__sync_val_compare_and_swap( dest, comparand, exchange)); -#endif // !_WIN32 +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED } -inline void fence() { _mm_mfence(); } -}; // namespace detail +inline void fence() +{ +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED + std::atomic_thread_fence(std::memory_order_seq_cst); +#elif _MSC_VER // !CL_HPP_CPP11_ATOMICS_SUPPORTED + _ReadWriteBarrier(); +#else // !_MSC_VER && !CL_HPP_CPP11_ATOMICS_SUPPORTED + __sync_synchronize(); +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED +} +} // namespace detail /*! \brief class used to interface between C++ and @@ -1124,7 +1171,7 @@ namespace detail template inline cl_int getInfoHelper(Functor f, cl_uint name, T* param, long) { - return f(name, sizeof(T), param, NULL); + return f(name, sizeof(T), param, nullptr); } // Specialized getInfoHelper for VECTOR_CLASS params @@ -1132,14 +1179,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, long) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } T* value = (T*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1159,14 +1206,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, typename T::cl_type = 0) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } typename T::cl_type* value = (typename T::cl_type*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1176,7 +1223,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, t param->assign(&value[0], &value[elements]); for (::size_t i = 0; i < elements; i++) { - if (value[i] != NULL) + if (value[i] != nullptr) { err = (*param)[i].retain(); if (err != CL_SUCCESS) @@ -1192,7 +1239,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int, t template inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, int) { - cl_int err = f(name, param->size() * sizeof(char*), &(*param)[0], NULL); + cl_int err = f(name, param->size() * sizeof(char*), &(*param)[0], nullptr); if (err != CL_SUCCESS) { @@ -1206,15 +1253,16 @@ inline cl_int getInfoHelper(Func f, cl_uint name, VECTOR_CLASS* param, in template inline cl_int getInfoHelper(Func f, cl_uint name, STRING_CLASS* param, long) { +#if defined(__NO_STD_VECTOR) || defined(__NO_STD_STRING) ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } char* value = (char*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1222,6 +1270,28 @@ inline cl_int getInfoHelper(Func f, cl_uint name, STRING_CLASS* param, long) *param = value; return CL_SUCCESS; +#else + ::size_t required; + cl_int err = f(name, 0, nullptr, &required); + if (err != CL_SUCCESS) + { + return err; + } + + // std::string has a constant data member + // a char vector does not + VECTOR_CLASS value(required); + err = f(name, required, value.data(), nullptr); + if (err != CL_SUCCESS) + { + return err; + } + if (param) + { + param->assign(value.begin(), value.end()); + } +#endif + return CL_SUCCESS; } // Specialized GetInfoHelper for cl::size_t params @@ -1229,14 +1299,14 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, size_t* param, long) { ::size_t required; - cl_int err = f(name, 0, NULL, &required); + cl_int err = f(name, 0, nullptr, &required); if (err != CL_SUCCESS) { return err; } ::size_t* value = (::size_t*)alloca(required); - err = f(name, required, value, NULL); + err = f(name, required, value, nullptr); if (err != CL_SUCCESS) { return err; @@ -1263,13 +1333,13 @@ template inline cl_int getInfoHelper(Func f, cl_uint name, T* param, int, typename T::cl_type = 0) { typename T::cl_type value; - cl_int err = f(name, sizeof(value), &value, NULL); + cl_int err = f(name, sizeof(value), &value, nullptr); if (err != CL_SUCCESS) { return err; } *param = value; - if (value != NULL) + if (value != nullptr) { err = param->retain(); if (err != CL_SUCCESS) @@ -1345,7 +1415,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, T* param, int, typename T::cl_ F(cl_event_info, CL_EVENT_COMMAND_QUEUE, cl::CommandQueue) \ F(cl_event_info, CL_EVENT_COMMAND_TYPE, cl_command_type) \ F(cl_event_info, CL_EVENT_REFERENCE_COUNT, cl_uint) \ - F(cl_event_info, CL_EVENT_COMMAND_EXECUTION_STATUS, cl_uint) \ + F(cl_event_info, CL_EVENT_COMMAND_EXECUTION_STATUS, cl_int) \ \ F(cl_profiling_info, CL_PROFILING_COMMAND_QUEUED, cl_ulong) \ F(cl_profiling_info, CL_PROFILING_COMMAND_SUBMIT, cl_ulong) \ @@ -1370,9 +1440,9 @@ inline cl_int getInfoHelper(Func f, cl_uint name, T* param, int, typename T::cl_ \ F(cl_sampler_info, CL_SAMPLER_REFERENCE_COUNT, cl_uint) \ F(cl_sampler_info, CL_SAMPLER_CONTEXT, cl::Context) \ - F(cl_sampler_info, CL_SAMPLER_NORMALIZED_COORDS, cl_addressing_mode) \ - F(cl_sampler_info, CL_SAMPLER_ADDRESSING_MODE, cl_filter_mode) \ - F(cl_sampler_info, CL_SAMPLER_FILTER_MODE, cl_bool) \ + F(cl_sampler_info, CL_SAMPLER_NORMALIZED_COORDS, cl_bool) \ + F(cl_sampler_info, CL_SAMPLER_ADDRESSING_MODE, cl_addressing_mode) \ + F(cl_sampler_info, CL_SAMPLER_FILTER_MODE, cl_filter_mode) \ \ F(cl_program_info, CL_PROGRAM_REFERENCE_COUNT, cl_uint) \ F(cl_program_info, CL_PROGRAM_CONTEXT, cl::Context) \ @@ -1442,6 +1512,7 @@ inline cl_int getInfoHelper(Func f, cl_uint name, T* param, int, typename T::cl_ F(cl_kernel_arg_info, CL_KERNEL_ARG_ACCESS_QUALIFIER, cl_kernel_arg_access_qualifier) \ F(cl_kernel_arg_info, CL_KERNEL_ARG_TYPE_NAME, STRING_CLASS) \ F(cl_kernel_arg_info, CL_KERNEL_ARG_NAME, STRING_CLASS) \ + F(cl_kernel_arg_info, CL_KERNEL_ARG_TYPE_QUALIFIER, cl_kernel_arg_type_qualifier) \ \ F(cl_device_info, CL_DEVICE_PARENT_DEVICE, cl_device_id) \ F(cl_device_info, CL_DEVICE_PARTITION_PROPERTIES, VECTOR_CLASS) \ @@ -1780,7 +1851,7 @@ static cl_uint getVersion(const char* versionInfo) ++index; } ++index; - while (versionInfo[index] != ' ') + while (versionInfo[index] != ' ' && versionInfo[index] != '\0') { lowVersion *= 10; lowVersion += versionInfo[index] - '0'; @@ -1792,7 +1863,7 @@ static cl_uint getVersion(const char* versionInfo) static cl_uint getPlatformVersion(cl_platform_id platform) { ::size_t size = 0; - clGetPlatformInfo(platform, CL_PLATFORM_VERSION, 0, NULL, &size); + clGetPlatformInfo(platform, CL_PLATFORM_VERSION, 0, nullptr, &size); char* versionInfo = (char*)alloca(size); clGetPlatformInfo(platform, CL_PLATFORM_VERSION, size, &versionInfo[0], &size); return getVersion(versionInfo); @@ -1801,7 +1872,7 @@ static cl_uint getPlatformVersion(cl_platform_id platform) static cl_uint getDevicePlatformVersion(cl_device_id device) { cl_platform_id platform; - clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform), &platform, NULL); + clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(platform), &platform, nullptr); return getPlatformVersion(platform); } @@ -1811,11 +1882,11 @@ static cl_uint getContextPlatformVersion(cl_context context) // The platform cannot be queried directly, so we first have to grab a // device and obtain its context ::size_t size = 0; - clGetContextInfo(context, CL_CONTEXT_DEVICES, 0, NULL, &size); + clGetContextInfo(context, CL_CONTEXT_DEVICES, 0, nullptr, &size); if (size == 0) return 0; cl_device_id* devices = (cl_device_id*)alloca(size); - clGetContextInfo(context, CL_CONTEXT_DEVICES, size, devices, NULL); + clGetContextInfo(context, CL_CONTEXT_DEVICES, size, devices, nullptr); return getDevicePlatformVersion(devices[0]); } #endif // #if defined(CL_VERSION_1_2) && defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) @@ -1830,13 +1901,13 @@ protected: cl_type object_; public: - Wrapper() : object_(NULL) {} + Wrapper() : object_(nullptr) {} Wrapper(const cl_type& obj) : object_(obj) {} ~Wrapper() { - if (object_ != NULL) + if (object_ != nullptr) { release(); } @@ -1845,29 +1916,56 @@ public: Wrapper(const Wrapper& rhs) { object_ = rhs.object_; - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } } +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + Wrapper(Wrapper&& rhs) CL_HPP_NOEXCEPT + { + object_ = rhs.object_; + rhs.object_ = nullptr; + } +#endif + Wrapper& operator=(const Wrapper& rhs) { - if (object_ != NULL) + if (this != &rhs) { - detail::errHandler(release(), __RELEASE_ERR); - } - object_ = rhs.object_; - if (object_ != NULL) - { - detail::errHandler(retain(), __RETAIN_ERR); + if (object_ != nullptr) + { + detail::errHandler(release(), __RELEASE_ERR); + } + object_ = rhs.object_; + if (object_ != nullptr) + { + detail::errHandler(retain(), __RETAIN_ERR); + } } return *this; } +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + Wrapper& operator=(Wrapper&& rhs) + { + if (this != &rhs) + { + if (object_ != nullptr) + { + detail::errHandler(release(), __RELEASE_ERR); + } + object_ = rhs.object_; + rhs.object_ = nullptr; + } + return *this; + } +#endif + Wrapper& operator=(const cl_type& rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } @@ -1907,7 +2005,7 @@ protected: static bool isReferenceCountable(cl_device_id device) { bool retVal = false; - if (device != NULL) + if (device != nullptr) { int version = getDevicePlatformVersion(device); if (version > ((1 << 16) + 1)) @@ -1919,7 +2017,7 @@ protected: } public: - Wrapper() : object_(NULL), referenceCountable_(false) + Wrapper() : object_(nullptr), referenceCountable_(false) { } @@ -1930,7 +2028,7 @@ public: ~Wrapper() { - if (object_ != NULL) + if (object_ != nullptr) { release(); } @@ -1940,30 +2038,61 @@ public: { object_ = rhs.object_; referenceCountable_ = isReferenceCountable(object_); - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(retain(), __RETAIN_ERR); } } - Wrapper& operator=(const Wrapper& rhs) +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + Wrapper(Wrapper&& rhs) CL_HPP_NOEXCEPT { - if (object_ != NULL) - { - detail::errHandler(release(), __RELEASE_ERR); - } object_ = rhs.object_; referenceCountable_ = rhs.referenceCountable_; - if (object_ != NULL) + rhs.object_ = nullptr; + rhs.referenceCountable_ = false; + } +#endif + + Wrapper& operator=(const Wrapper& rhs) + { + if (this != &rhs) { - detail::errHandler(retain(), __RETAIN_ERR); + if (object_ != nullptr) + { + detail::errHandler(release(), __RELEASE_ERR); + } + object_ = rhs.object_; + referenceCountable_ = rhs.referenceCountable_; + if (object_ != nullptr) + { + detail::errHandler(retain(), __RETAIN_ERR); + } } return *this; } +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + Wrapper& operator=(Wrapper&& rhs) + { + if (this != &rhs) + { + if (object_ != nullptr) + { + detail::errHandler(release(), __RELEASE_ERR); + } + object_ = rhs.object_; + referenceCountable_ = rhs.referenceCountable_; + rhs.object_ = nullptr; + rhs.referenceCountable_ = false; + } + return *this; + } +#endif + Wrapper& operator=(const cl_type& rhs) { - if (object_ != NULL) + if (object_ != nullptr) { detail::errHandler(release(), __RELEASE_ERR); } @@ -2011,7 +2140,7 @@ protected: } // namespace detail //! \endcond -/*! \struct ImageFormat +/*! \stuct ImageFormat * \brief Adds constructors and member functions for cl_image_format. * * \see cl_image_format @@ -2050,39 +2179,20 @@ struct ImageFormat : public cl_image_format class Device : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Device() : detail::Wrapper() {} - /*! \brief Copy constructor. - * - * This simply copies the device ID value, which is an inexpensive operation. - */ - Device(const Device& device) : detail::Wrapper(device) {} - /*! \brief Constructor from cl_device_id. * * This simply copies the device ID value, which is an inexpensive operation. */ - Device(const cl_device_id& device) : detail::Wrapper(device) {} + __CL_EXPLICIT_CONSTRUCTORS Device(const cl_device_id& device) : detail::Wrapper(device) {} /*! \brief Returns the first device on the default context. * * \see Context::getDefault() */ - static Device getDefault(cl_int* err = NULL); - - /*! \brief Assignment operator from Device. - * - * This simply copies the device ID value, which is an inexpensive operation. - */ - Device& operator=(const Device& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } + static Device getDefault(cl_int* err = nullptr); /*! \brief Assignment operator from cl_device_id. * @@ -2094,6 +2204,36 @@ public: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Device(const Device& dev) : detail::Wrapper(dev) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Device& operator=(const Device& dev) + { + detail::Wrapper::operator=(dev); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Device(Device&& dev) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(dev)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Device& operator=(Device&& dev) + { + detail::Wrapper::operator=(std::move(dev)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + //! \brief Wrapper for clGetDeviceInfo(). template cl_int getInfo(cl_device_info name, T* param) const @@ -2106,12 +2246,12 @@ public: //! \brief Wrapper for clGetDeviceInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_device_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2128,14 +2268,14 @@ public: VECTOR_CLASS* devices) { cl_uint n = 0; - cl_int err = clCreateSubDevices(object_, properties, 0, NULL, &n); + cl_int err = clCreateSubDevices(object_, properties, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = clCreateSubDevices(object_, properties, n, ids, NULL); + err = clCreateSubDevices(object_, properties, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); @@ -2162,18 +2302,18 @@ public: cl_device_id* /*out_devices*/, cl_uint* /*num_devices*/) CL_EXT_SUFFIX__VERSION_1_1; - static PFN_clCreateSubDevicesEXT pfn_clCreateSubDevicesEXT = NULL; + static PFN_clCreateSubDevicesEXT pfn_clCreateSubDevicesEXT = nullptr; __INIT_CL_EXT_FCN_PTR(clCreateSubDevicesEXT); cl_uint n = 0; - cl_int err = pfn_clCreateSubDevicesEXT(object_, properties, 0, NULL, &n); + cl_int err = pfn_clCreateSubDevicesEXT(object_, properties, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = pfn_clCreateSubDevicesEXT(object_, properties, n, ids, NULL); + err = pfn_clCreateSubDevicesEXT(object_, properties, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_SUB_DEVICES); @@ -2196,33 +2336,14 @@ public: class Platform : public detail::Wrapper { public: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Platform() : detail::Wrapper() {} - /*! \brief Copy constructor. - * - * This simply copies the platform ID value, which is an inexpensive operation. - */ - Platform(const Platform& platform) : detail::Wrapper(platform) {} - /*! \brief Constructor from cl_platform_id. * * This simply copies the platform ID value, which is an inexpensive operation. */ - Platform(const cl_platform_id& platform) : detail::Wrapper(platform) {} - - /*! \brief Assignment operator from Platform. - * - * This simply copies the platform ID value, which is an inexpensive operation. - */ - Platform& operator=(const Platform& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } + __CL_EXPLICIT_CONSTRUCTORS Platform(const cl_platform_id& platform) : detail::Wrapper(platform) {} /*! \brief Assignment operator from cl_platform_id. * @@ -2245,12 +2366,12 @@ public: //! \brief Wrapper for clGetPlatformInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_platform_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2266,18 +2387,18 @@ public: VECTOR_CLASS* devices) const { cl_uint n = 0; - if (devices == NULL) + if (devices == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR); } - cl_int err = ::clGetDeviceIDs(object_, type, 0, NULL, &n); + cl_int err = ::clGetDeviceIDs(object_, type, 0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); } cl_device_id* ids = (cl_device_id*)alloca(n * sizeof(cl_device_id)); - err = ::clGetDeviceIDs(object_, type, n, ids, NULL); + err = ::clGetDeviceIDs(object_, type, n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); @@ -2298,7 +2419,7 @@ public: * * \param devices returns a vector of OpenCL D3D10 devices found. The cl::Device * values returned in devices can be used to identify a specific OpenCL - * device. If \a devices argument is NULL, this argument is ignored. + * device. If \a devices argument is nullptr, this argument is ignored. * * \return One of the following values: * - CL_SUCCESS if the function is executed successfully. @@ -2326,12 +2447,12 @@ public: cl_device_id* devices, cl_uint* num_devices); - if (devices == NULL) + if (devices == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_DEVICE_IDS_ERR); } - static PFN_clGetDeviceIDsFromD3D10KHR pfn_clGetDeviceIDsFromD3D10KHR = NULL; + static PFN_clGetDeviceIDsFromD3D10KHR pfn_clGetDeviceIDsFromD3D10KHR = nullptr; __INIT_CL_EXT_FCN_PTR_PLATFORM(object_, clGetDeviceIDsFromD3D10KHR); cl_uint n = 0; @@ -2341,7 +2462,7 @@ public: d3d_object, d3d_device_set, 0, - NULL, + nullptr, &n); if (err != CL_SUCCESS) { @@ -2356,7 +2477,7 @@ public: d3d_device_set, n, ids, - NULL); + nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_DEVICE_IDS_ERR); @@ -2376,12 +2497,12 @@ public: { cl_uint n = 0; - if (platforms == NULL) + if (platforms == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_PLATFORM_IDS_ERR); } - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2389,7 +2510,7 @@ public: cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2408,12 +2529,12 @@ public: { cl_uint n = 0; - if (platform == NULL) + if (platform == nullptr) { return detail::errHandler(CL_INVALID_ARG_VALUE, __GET_PLATFORM_IDS_ERR); } - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2421,7 +2542,7 @@ public: cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_PLATFORM_IDS_ERR); @@ -2436,39 +2557,41 @@ public: * Wraps clGetPlatformIDs(), returning the first result. */ static Platform get( - cl_int* errResult = NULL) + cl_int* errResult = nullptr) { Platform platform; cl_uint n = 0; - cl_int err = ::clGetPlatformIDs(0, NULL, &n); + cl_int err = ::clGetPlatformIDs(0, nullptr, &n); if (err != CL_SUCCESS) { detail::errHandler(err, __GET_PLATFORM_IDS_ERR); - if (errResult != NULL) + if (errResult != nullptr) { *errResult = err; } + return Platform(); } cl_platform_id* ids = (cl_platform_id*)alloca( n * sizeof(cl_platform_id)); - err = ::clGetPlatformIDs(n, ids, NULL); + err = ::clGetPlatformIDs(n, ids, nullptr); if (err != CL_SUCCESS) { detail::errHandler(err, __GET_PLATFORM_IDS_ERR); + if (errResult != nullptr) + { + *errResult = err; + } + return Platform(); } - if (errResult != NULL) - { - *errResult = err; - } - return ids[0]; + return Platform(ids[0]); } static Platform getDefault( - cl_int* errResult = NULL) + cl_int* errResult = nullptr) { return get(errResult); } @@ -2513,31 +2636,29 @@ class Context : public detail::Wrapper { private: +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED + static std::atomic default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED static volatile int default_initialized_; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED static Context default_; static volatile cl_int default_error_; public: - /*! \brief Destructor. - * - * This calls clReleaseContext() on the value held by this instance. - */ - ~Context() {} - /*! \brief Constructs a context including a list of specified devices. * * Wraps clCreateContext(). */ Context( const VECTOR_CLASS& devices, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -2554,7 +2675,7 @@ public: notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2562,14 +2683,14 @@ public: Context( const Device& device, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -2581,44 +2702,97 @@ public: notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - /*! \brief Constructs a context including all devices of a specified type. + /*! \brief Constructs a context including all or a subset of devices of a specified type. * * Wraps clCreateContextFromType(). */ Context( cl_device_type type, - cl_context_properties* properties = NULL, + cl_context_properties* properties = nullptr, void(CL_CALLBACK* notifyFptr)( const char*, const void*, ::size_t, - void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { cl_int error; -#if !defined(__APPLE__) || !defined(__MACOS) +#if !defined(__APPLE__) && !defined(__MACOS) cl_context_properties prop[4] = {CL_CONTEXT_PLATFORM, 0, 0, 0}; - if (properties == NULL) + + if (properties == nullptr) { - prop[1] = (cl_context_properties)Platform::get(&error)(); + // Get a valid platform ID as we cannot send in a blank one + VECTOR_CLASS platforms; + error = Platform::get(&platforms); if (error != CL_SUCCESS) { detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; - return; + } + return; + } + + // Check the platforms we found for a device of our specified type + cl_context_properties platform_id = 0; + for (unsigned int i = 0; i < platforms.size(); i++) + { + VECTOR_CLASS devices; + +#if defined(__CL_ENABLE_EXCEPTIONS) + try + { +#endif + + error = platforms[i].getDevices(type, &devices); + +#if defined(__CL_ENABLE_EXCEPTIONS) + } + catch (Error) + { + } + // Catch if exceptions are enabled as we don't want to exit if first platform has no devices of type + // We do error checking next anyway, and can throw there if needed +#endif + + // Only squash CL_SUCCESS and CL_DEVICE_NOT_FOUND + if (error != CL_SUCCESS && error != CL_DEVICE_NOT_FOUND) + { + detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); + if (err != nullptr) + { + *err = error; + } + } + + if (devices.size() > 0) + { + platform_id = (cl_context_properties)platforms[i](); + break; } } + if (platform_id == 0) + { + detail::errHandler(CL_DEVICE_NOT_FOUND, __CREATE_CONTEXT_FROM_TYPE_ERR); + if (err != nullptr) + { + *err = CL_DEVICE_NOT_FOUND; + } + return; + } + + prop[1] = platform_id; properties = &prop[0]; } #endif @@ -2626,17 +2800,47 @@ public: properties, type, notifyFptr, data, &error); detail::errHandler(error, __CREATE_CONTEXT_FROM_TYPE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Context(const Context& ctx) : detail::Wrapper(ctx) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Context& operator=(const Context& ctx) + { + detail::Wrapper::operator=(ctx); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Context(Context&& ctx) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(ctx)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Context& operator=(Context&& ctx) + { + detail::Wrapper::operator=(std::move(ctx)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Returns a singleton context including all devices of CL_DEVICE_TYPE_DEFAULT. * * \note All calls to this function return the same cl_context as the first. */ - static Context getDefault(cl_int* err = NULL) + static Context getDefault(cl_int* err = nullptr) { int state = detail::compare_exchange( &default_initialized_, @@ -2644,7 +2848,7 @@ public: if (state & __DEFAULT_INITIALIZED) { - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -2659,7 +2863,7 @@ public: detail::fence(); } - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -2669,9 +2873,9 @@ public: cl_int error; default_ = Context( CL_DEVICE_TYPE_DEFAULT, - NULL, - NULL, - NULL, + nullptr, + nullptr, + nullptr, &error); detail::fence(); @@ -2682,22 +2886,16 @@ public: detail::fence(); - if (err != NULL) + if (err != nullptr) { *err = default_error_; } return default_; } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Context() : detail::Wrapper() {} - /*! \brief Copy constructor. - * - * This calls clRetainContext() on the parameter's cl_context. - */ - Context(const Context& context) : detail::Wrapper(context) {} - /*! \brief Constructor from cl_context - takes ownership. * * This effectively transfers ownership of a refcount on the cl_context @@ -2705,20 +2903,6 @@ public: */ __CL_EXPLICIT_CONSTRUCTORS Context(const cl_context& context) : detail::Wrapper(context) {} - /*! \brief Assignment operator from Context. - * - * This calls clRetainContext() on the parameter and clReleaseContext() on - * the previous value held by this instance. - */ - Context& operator=(const Context& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } - /*! \brief Assignment operator from cl_context - takes ownership. * * This effectively transfers ownership of a refcount on the rhs and calls @@ -2742,12 +2926,12 @@ public: //! \brief Wrapper for clGetContextInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_context_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2764,33 +2948,46 @@ public: VECTOR_CLASS* formats) const { cl_uint numEntries; + + if (!formats) + { + return CL_SUCCESS; + } + cl_int err = ::clGetSupportedImageFormats( object_, flags, type, 0, - NULL, + nullptr, &numEntries); if (err != CL_SUCCESS) { return detail::errHandler(err, __GET_SUPPORTED_IMAGE_FORMATS_ERR); } - ImageFormat* value = (ImageFormat*) - alloca(numEntries * sizeof(ImageFormat)); - err = ::clGetSupportedImageFormats( - object_, - flags, - type, - numEntries, - (cl_image_format*)value, - NULL); - if (err != CL_SUCCESS) + if (numEntries > 0) { - return detail::errHandler(err, __GET_SUPPORTED_IMAGE_FORMATS_ERR); - } + ImageFormat* value = (ImageFormat*) + alloca(numEntries * sizeof(ImageFormat)); + err = ::clGetSupportedImageFormats( + object_, + flags, + type, + numEntries, + (cl_image_format*)value, + nullptr); + if (err != CL_SUCCESS) + { + return detail::errHandler(err, __GET_SUPPORTED_IMAGE_FORMATS_ERR); + } - formats->assign(&value[0], &value[numEntries]); + formats->assign(&value[0], &value[numEntries]); + } + else + { + formats->clear(); + } return CL_SUCCESS; } }; @@ -2801,11 +2998,11 @@ inline Device Device::getDefault(cl_int* err) Device device; Context context = Context::getDefault(&error); - detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); + detail::errHandler(error, __CREATE_CONTEXT_ERR); if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -2813,7 +3010,7 @@ inline Device Device::getDefault(cl_int* err) else { device = context.getInfo()[0]; - if (err != NULL) + if (err != nullptr) { *err = CL_SUCCESS; } @@ -2824,14 +3021,22 @@ inline Device Device::getDefault(cl_int* err) #ifdef _WIN32 +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED +__declspec(selectany) std::atomic Context::default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED __declspec(selectany) volatile int Context::default_initialized_ = __DEFAULT_NOT_INITIALIZED; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED __declspec(selectany) Context Context::default_; __declspec(selectany) volatile cl_int Context::default_error_ = CL_SUCCESS; -#else +#else // !_WIN32 +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED +__attribute__((weak)) std::atomic Context::default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED __attribute__((weak)) volatile int Context::default_initialized_ = __DEFAULT_NOT_INITIALIZED; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED __attribute__((weak)) Context Context::default_; __attribute__((weak)) volatile cl_int Context::default_error_ = CL_SUCCESS; -#endif +#endif // !_WIN32 /*! \brief Class interface for cl_event. * @@ -2844,47 +3049,21 @@ __attribute__((weak)) volatile cl_int Context::default_error_ = CL_SUCCESS; class Event : public detail::Wrapper { public: - /*! \brief Destructor. - * - * This calls clReleaseEvent() on the value held by this instance. - */ - ~Event() {} - - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Event() : detail::Wrapper() {} - /*! \brief Copy constructor. - * - * This calls clRetainEvent() on the parameter's cl_event. - */ - Event(const Event& event) : detail::Wrapper(event) {} - /*! \brief Constructor from cl_event - takes ownership. * * This effectively transfers ownership of a refcount on the cl_event * into the new Event object. */ - Event(const cl_event& event) : detail::Wrapper(event) {} + __CL_EXPLICIT_CONSTRUCTORS Event(const cl_event& event) : detail::Wrapper(event) {} /*! \brief Assignment operator from cl_event - takes ownership. * * This effectively transfers ownership of a refcount on the rhs and calls * clReleaseEvent() on the value previously held by this instance. */ - Event& operator=(const Event& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } - - /*! \brief Assignment operator from cl_event. - * - * This calls clRetainEvent() on the parameter and clReleaseEvent() on - * the previous value held by this instance. - */ Event& operator=(const cl_event& rhs) { detail::Wrapper::operator=(rhs); @@ -2903,12 +3082,12 @@ public: //! \brief Wrapper for clGetEventInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_event_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2927,12 +3106,12 @@ public: //! \brief Wrapper for clGetEventProfilingInfo() that returns by value. template typename detail::param_traits::param_type - getProfilingInfo(cl_int* err = NULL) const + getProfilingInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_profiling_info, name>::param_type param; cl_int result = getProfilingInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -2958,7 +3137,7 @@ public: cl_int setCallback( cl_int type, void(CL_CALLBACK* pfn_notify)(cl_event, cl_int, void*), - void* user_data = NULL) + void* user_data = nullptr) { return detail::errHandler( ::clSetEventCallback( @@ -2979,7 +3158,7 @@ public: { return detail::errHandler( ::clWaitForEvents( - (cl_uint)events.size(), (cl_event*)&events.front()), + (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : nullptr), __WAIT_FOR_EVENTS_ERR); } }; @@ -2998,7 +3177,7 @@ public: */ UserEvent( const Context& context, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateUserEvent( @@ -3006,28 +3185,15 @@ public: &error); detail::errHandler(error, __CREATE_USER_EVENT_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. UserEvent() : Event() {} - //! \brief Copy constructor - performs shallow copy. - UserEvent(const UserEvent& event) : Event(event) {} - - //! \brief Assignment Operator - performs shallow copy. - UserEvent& operator=(const UserEvent& rhs) - { - if (this != &rhs) - { - Event::operator=(rhs); - } - return *this; - } - /*! \brief Sets the execution status of a user event object. * * Wraps clSetUserEventStatus(). @@ -3050,7 +3216,7 @@ WaitForEvents(const VECTOR_CLASS& events) { return detail::errHandler( ::clWaitForEvents( - (cl_uint)events.size(), (cl_event*)&events.front()), + (cl_uint)events.size(), (events.size() > 0) ? (cl_event*)&events.front() : nullptr), __WAIT_FOR_EVENTS_ERR); } @@ -3065,21 +3231,9 @@ WaitForEvents(const VECTOR_CLASS& events) class Memory : public detail::Wrapper { public: - /*! \brief Destructor. - * - * This calls clReleaseMemObject() on the value held by this instance. - */ - ~Memory() {} - - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Memory() : detail::Wrapper() {} - /*! \brief Copy constructor - performs shallow copy. - * - * This calls clRetainMemObject() on the parameter's cl_mem. - */ - Memory(const Memory& memory) : detail::Wrapper(memory) {} - /*! \brief Constructor from cl_mem - takes ownership. * * This effectively transfers ownership of a refcount on the cl_mem @@ -3087,20 +3241,6 @@ public: */ __CL_EXPLICIT_CONSTRUCTORS Memory(const cl_mem& memory) : detail::Wrapper(memory) {} - /*! \brief Assignment operator from Memory. - * - * This calls clRetainMemObject() on the parameter and clReleaseMemObject() - * on the previous value held by this instance. - */ - Memory& operator=(const Memory& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } - /*! \brief Assignment operator from cl_mem - takes ownership. * * This effectively transfers ownership of a refcount on the rhs and calls @@ -3112,6 +3252,36 @@ public: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Memory(const Memory& mem) : detail::Wrapper(mem) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Memory& operator=(const Memory& mem) + { + detail::Wrapper::operator=(mem); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Memory(Memory&& mem) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(mem)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Memory& operator=(Memory&& mem) + { + detail::Wrapper::operator=(std::move(mem)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + //! \brief Wrapper for clGetMemObjectInfo(). template cl_int getInfo(cl_mem_info name, T* param) const @@ -3124,12 +3294,12 @@ public: //! \brief Wrapper for clGetMemObjectInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_mem_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3152,7 +3322,7 @@ public: */ cl_int setDestructorCallback( void(CL_CALLBACK* pfn_notify)(cl_mem, void*), - void* user_data = NULL) + void* user_data = nullptr) { return detail::errHandler( ::clSetMemObjectDestructorCallback( @@ -3170,6 +3340,11 @@ template cl_int copy(IteratorType startIterator, IteratorType endIterator, cl::Buffer& buffer); template cl_int copy(const cl::Buffer& buffer, IteratorType startIterator, IteratorType endIterator); +template +cl_int copy(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator, cl::Buffer& buffer); +template +cl_int copy(const CommandQueue& queue, const cl::Buffer& buffer, IteratorType startIterator, IteratorType endIterator); + /*! \brief Class interface for Buffer Memory Objects. * @@ -3191,14 +3366,14 @@ public: const Context& context, cl_mem_flags flags, ::size_t size, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3216,8 +3391,8 @@ public: Buffer( cl_mem_flags flags, ::size_t size, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -3226,7 +3401,7 @@ public: object_ = ::clCreateBuffer(context(), flags, size, host_ptr, &error); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3234,7 +3409,8 @@ public: /*! * \brief Construct a Buffer from a host container via iterators. - * If useHostPtr is specified iterators must be random access. + * IteratorType must be random access. + * If useHostPtr is specified iterators must represent contiguous data. */ template Buffer( @@ -3242,7 +3418,7 @@ public: IteratorType endIterator, bool readOnly, bool useHostPtr = false, - cl_int* err = NULL) + cl_int* err = nullptr) { typedef typename std::iterator_traits::value_type DataType; cl_int error; @@ -3275,7 +3451,7 @@ public: } detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3284,21 +3460,32 @@ public: { error = cl::copy(startIterator, endIterator, *this); detail::errHandler(error, __CREATE_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } } - //! \brief Default constructor - initializes to NULL. - Buffer() : Memory() {} - - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. + /*! + * \brief Construct a Buffer from a host container via iterators using a specified context. + * IteratorType must be random access. + * If useHostPtr is specified iterators must represent contiguous data. */ - Buffer(const Buffer& buffer) : Memory(buffer) {} + template + Buffer(const Context& context, IteratorType startIterator, IteratorType endIterator, + bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); + + /*! + * \brief Construct a Buffer from a host container via iterators using a specified queue. + * If useHostPtr is specified iterators must represent contiguous data. + */ + template + Buffer(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator, + bool readOnly, bool useHostPtr = false, cl_int* err = nullptr); + + //! \brief Default constructor - initializes to nullptr. + Buffer() : Memory() {} /*! \brief Constructor from cl_mem - takes ownership. * @@ -3306,19 +3493,6 @@ public: */ __CL_EXPLICIT_CONSTRUCTORS Buffer(const cl_mem& buffer) : Memory(buffer) {} - /*! \brief Assignment from Buffer - performs shallow copy. - * - * See Memory for further details. - */ - Buffer& operator=(const Buffer& rhs) - { - if (this != &rhs) - { - Memory::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -3329,6 +3503,36 @@ public: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Buffer(const Buffer& buf) : Memory(buf) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Buffer& operator=(const Buffer& buf) + { + Memory::operator=(buf); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Buffer(Buffer&& buf) CL_HPP_NOEXCEPT : Memory(std::move(buf)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Buffer& operator=(Buffer&& buf) + { + Memory::operator=(std::move(buf)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + #if defined(CL_VERSION_1_1) /*! \brief Creates a new buffer object from this. * @@ -3338,7 +3542,7 @@ public: cl_mem_flags flags, cl_buffer_create_type buffer_create_type, const void* buffer_create_info, - cl_int* err = NULL) + cl_int* err = nullptr) { Buffer result; cl_int error; @@ -3350,7 +3554,7 @@ public: &error); detail::errHandler(error, __CREATE_SUBBUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3385,9 +3589,9 @@ public: const Context& context, cl_mem_flags flags, ID3D10Buffer* bufobj, - cl_int* err = NULL) + cl_int* err = nullptr) { - static PFN_clCreateFromD3D10BufferKHR pfn_clCreateFromD3D10BufferKHR = NULL; + static PFN_clCreateFromD3D10BufferKHR pfn_clCreateFromD3D10BufferKHR = nullptr; #if defined(CL_VERSION_1_2) vector props = context.getInfo(); @@ -3413,40 +3617,21 @@ public: &error); detail::errHandler(error, __CREATE_GL_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. BufferD3D10() : Buffer() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - BufferD3D10(const BufferD3D10& buffer) : Buffer(buffer) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS BufferD3D10(const cl_mem& buffer) : Buffer(buffer) {} - /*! \brief Assignment from BufferD3D10 - performs shallow copy. - * - * See Memory for further details. - */ - BufferD3D10& operator=(const BufferD3D10& rhs) - { - if (this != &rhs) - { - Buffer::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -3456,6 +3641,36 @@ public: Buffer::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + BufferD3D10(const BufferD3D10& buf) : Buffer(buf) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + BufferD3D10& operator=(const BufferD3D10& buf) + { + Buffer::operator=(buf); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + BufferD3D10(BufferD3D10&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + BufferD3D10& operator=(BufferD3D10&& buf) + { + Buffer::operator=(std::move(buf)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif @@ -3478,8 +3693,8 @@ public: BufferGL( const Context& context, cl_mem_flags flags, - GLuint bufobj, - cl_int* err = NULL) + cl_GLuint bufobj, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLBuffer( @@ -3489,40 +3704,21 @@ public: &error); detail::errHandler(error, __CREATE_GL_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. BufferGL() : Buffer() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - BufferGL(const BufferGL& buffer) : Buffer(buffer) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS BufferGL(const cl_mem& buffer) : Buffer(buffer) {} - /*! \brief Assignment from BufferGL - performs shallow copy. - * - * See Memory for further details. - */ - BufferGL& operator=(const BufferGL& rhs) - { - if (this != &rhs) - { - Buffer::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -3533,95 +3729,40 @@ public: return *this; } - //! \brief Wrapper for clGetGLObjectInfo(). - cl_int getObjectInfo( - cl_gl_object_type* type, - GLuint* gl_object_name) + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + BufferGL(const BufferGL& buf) : Buffer(buf) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + BufferGL& operator=(const BufferGL& buf) { - return detail::errHandler( - ::clGetGLObjectInfo(object_, type, gl_object_name), - __GET_GL_OBJECT_INFO_ERR); - } -}; - -/*! \brief Class interface for GL Render Buffer Memory Objects. - * - * This is provided to facilitate interoperability with OpenGL. - * - * See Memory for details about copy semantics, etc. - * - * \see Memory - */ -class BufferRenderGL : public Buffer -{ -public: - /*! \brief Constructs a BufferRenderGL in a specified context, from a given - * GL Renderbuffer. - * - * Wraps clCreateFromGLRenderbuffer(). - */ - BufferRenderGL( - const Context& context, - cl_mem_flags flags, - GLuint bufobj, - cl_int* err = NULL) - { - cl_int error; - object_ = ::clCreateFromGLRenderbuffer( - context(), - flags, - bufobj, - &error); - - detail::errHandler(error, __CREATE_GL_RENDER_BUFFER_ERR); - if (err != NULL) - { - *err = error; - } - } - - //! \brief Default constructor - initializes to NULL. - BufferRenderGL() : Buffer() {} - - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - BufferRenderGL(const BufferGL& buffer) : Buffer(buffer) {} - - /*! \brief Constructor from cl_mem - takes ownership. - * - * See Memory for further details. - */ - __CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : Buffer(buffer) {} - - /*! \brief Assignment from BufferGL - performs shallow copy. - * - * See Memory for further details. - */ - BufferRenderGL& operator=(const BufferRenderGL& rhs) - { - if (this != &rhs) - { - Buffer::operator=(rhs); - } + Buffer::operator=(buf); return *this; } - /*! \brief Assignment from cl_mem - performs shallow copy. - * - * See Memory for further details. - */ - BufferRenderGL& operator=(const cl_mem& rhs) +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + BufferGL(BufferGL&& buf) CL_HPP_NOEXCEPT : Buffer(std::move(buf)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + BufferGL& operator=(BufferGL&& buf) { - Buffer::operator=(rhs); + Buffer::operator=(std::move(buf)); return *this; } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) //! \brief Wrapper for clGetGLObjectInfo(). cl_int getObjectInfo( cl_gl_object_type* type, - GLuint* gl_object_name) + cl_GLuint* gl_object_name) { return detail::errHandler( ::clGetGLObjectInfo(object_, type, gl_object_name), @@ -3638,34 +3779,15 @@ public: class Image : public Memory { protected: - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image() : Memory() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image(const Image& image) : Memory(image) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS Image(const cl_mem& image) : Memory(image) {} - /*! \brief Assignment from Image - performs shallow copy. - * - * See Memory for further details. - */ - Image& operator=(const Image& rhs) - { - if (this != &rhs) - { - Memory::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -3676,6 +3798,36 @@ protected: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image(const Image& img) : Memory(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image& operator=(const Image& img) + { + Memory::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image(Image&& img) CL_HPP_NOEXCEPT : Memory(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image& operator=(Image&& img) + { + Memory::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + public: //! \brief Wrapper for clGetImageInfo(). template @@ -3689,12 +3841,12 @@ public: //! \brief Wrapper for clGetImageInfo() that returns by value. template typename detail::param_traits::param_type - getImageInfo(cl_int* err = NULL) const + getImageInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_image_info, name>::param_type param; cl_int result = getImageInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -3721,17 +3873,15 @@ public: cl_mem_flags flags, ImageFormat format, ::size_t width, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE1D; - desc.image_width = width; - desc.image_row_pitch = 0; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = 0; + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE1D, + width, + 0, 0, 0, 0, 0, 0, 0, 0}; object_ = ::clCreateImage( context(), flags, @@ -3741,40 +3891,21 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image1D() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image1D(const Image1D& image1D) : Image(image1D) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS Image1D(const cl_mem& image1D) : Image(image1D) {} - /*! \brief Assignment from Image1D - performs shallow copy. - * - * See Memory for further details. - */ - Image1D& operator=(const Image1D& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -3784,6 +3915,36 @@ public: Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1D(const Image1D& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1D& operator=(const Image1D& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1D(Image1D&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1D& operator=(Image1D&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; /*! \class Image1DBuffer @@ -3798,26 +3959,25 @@ public: ImageFormat format, ::size_t width, const Buffer& buffer, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE1D_BUFFER; - desc.image_width = width; - desc.image_row_pitch = 0; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = buffer(); + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE1D_BUFFER, + width, + 0, 0, 0, 0, 0, 0, 0, + buffer()}; object_ = ::clCreateImage( context(), flags, &format, &desc, - NULL, + nullptr, &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3825,24 +3985,43 @@ public: Image1DBuffer() {} - Image1DBuffer(const Image1DBuffer& image1D) : Image(image1D) {} - __CL_EXPLICIT_CONSTRUCTORS Image1DBuffer(const cl_mem& image1D) : Image(image1D) {} - Image1DBuffer& operator=(const Image1DBuffer& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - Image1DBuffer& operator=(const cl_mem& rhs) { Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1DBuffer(const Image1DBuffer& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1DBuffer& operator=(const Image1DBuffer& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1DBuffer(Image1DBuffer&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1DBuffer& operator=(Image1DBuffer&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; /*! \class Image1DArray @@ -3858,18 +4037,18 @@ public: ::size_t arraySize, ::size_t width, ::size_t rowPitch, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE1D_ARRAY; - desc.image_array_size = arraySize; - desc.image_width = width; - desc.image_row_pitch = rowPitch; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = 0; + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE1D_ARRAY, + width, + 0, 0, // height, depth (unused) + arraySize, + rowPitch, + 0, 0, 0, 0}; object_ = ::clCreateImage( context(), flags, @@ -3879,7 +4058,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3887,24 +4066,43 @@ public: Image1DArray() {} - Image1DArray(const Image1DArray& imageArray) : Image(imageArray) {} - __CL_EXPLICIT_CONSTRUCTORS Image1DArray(const cl_mem& imageArray) : Image(imageArray) {} - Image1DArray& operator=(const Image1DArray& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - Image1DArray& operator=(const cl_mem& rhs) { Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1DArray(const Image1DArray& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image1DArray& operator=(const Image1DArray& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1DArray(Image1DArray&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image1DArray& operator=(Image1DArray&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif // #if defined(CL_VERSION_1_2) @@ -3929,8 +4127,8 @@ public: ::size_t width, ::size_t height, ::size_t row_pitch = 0, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; bool useCreateImage; @@ -3950,14 +4148,14 @@ public: #if defined(CL_VERSION_1_2) if (useCreateImage) { - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE2D; - desc.image_width = width; - desc.image_height = height; - desc.image_row_pitch = row_pitch; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = 0; + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE2D, + width, + height, + 0, 0, // depth, array size (unused) + row_pitch, + 0, 0, 0, 0}; object_ = ::clCreateImage( context(), flags, @@ -3967,7 +4165,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3980,7 +4178,7 @@ public: context(), flags, &format, width, height, row_pitch, host_ptr, &error); detail::errHandler(error, __CREATE_IMAGE2D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -3988,34 +4186,15 @@ public: #endif // #if !defined(CL_VERSION_1_2) || defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image2D() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image2D(const Image2D& image2D) : Image(image2D) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS Image2D(const cl_mem& image2D) : Image(image2D) {} - /*! \brief Assignment from Image2D - performs shallow copy. - * - * See Memory for further details. - */ - Image2D& operator=(const Image2D& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -4025,6 +4204,36 @@ public: Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2D(const Image2D& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2D& operator=(const Image2D& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2D(Image2D&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2D& operator=(Image2D&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; @@ -4049,10 +4258,10 @@ public: Image2DGL( const Context& context, cl_mem_flags flags, - GLenum target, - GLint miplevel, - GLuint texobj, - cl_int* err = NULL) + cl_GLenum target, + cl_GLint miplevel, + cl_GLuint texobj, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture2D( @@ -4064,40 +4273,21 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_2D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image2DGL() : Image2D() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image2DGL(const Image2DGL& image) : Image2D(image) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS Image2DGL(const cl_mem& image) : Image2D(image) {} - /*! \brief Assignment from Image2DGL - performs shallow copy. - * - * See Memory for further details. - */ - Image2DGL& operator=(const Image2DGL& rhs) - { - if (this != &rhs) - { - Image2D::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -4107,6 +4297,36 @@ public: Image2D::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2DGL(const Image2DGL& img) : Image2D(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2DGL& operator=(const Image2DGL& img) + { + Image2D::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2DGL(Image2DGL&& img) CL_HPP_NOEXCEPT : Image2D(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2DGL& operator=(Image2DGL&& img) + { + Image2D::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif // #if !defined(CL_VERSION_1_2) @@ -4126,20 +4346,20 @@ public: ::size_t height, ::size_t rowPitch, ::size_t slicePitch, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE2D_ARRAY; - desc.image_array_size = arraySize; - desc.image_width = width; - desc.image_height = height; - desc.image_row_pitch = rowPitch; - desc.image_slice_pitch = slicePitch; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = 0; + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE2D_ARRAY, + width, + height, + 0, // depth (unused) + arraySize, + rowPitch, + slicePitch, + 0, 0, 0}; object_ = ::clCreateImage( context(), flags, @@ -4149,7 +4369,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4157,24 +4377,43 @@ public: Image2DArray() {} - Image2DArray(const Image2DArray& imageArray) : Image(imageArray) {} - __CL_EXPLICIT_CONSTRUCTORS Image2DArray(const cl_mem& imageArray) : Image(imageArray) {} - Image2DArray& operator=(const Image2DArray& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - Image2DArray& operator=(const cl_mem& rhs) { Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2DArray(const Image2DArray& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image2DArray& operator=(const Image2DArray& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2DArray(Image2DArray&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image2DArray& operator=(Image2DArray&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif // #if defined(CL_VERSION_1_2) @@ -4200,8 +4439,8 @@ public: ::size_t depth, ::size_t row_pitch = 0, ::size_t slice_pitch = 0, - void* host_ptr = NULL, - cl_int* err = NULL) + void* host_ptr = nullptr, + cl_int* err = nullptr) { cl_int error; bool useCreateImage; @@ -4221,16 +4460,16 @@ public: #if defined(CL_VERSION_1_2) if (useCreateImage) { - cl_image_desc desc; - desc.image_type = CL_MEM_OBJECT_IMAGE3D; - desc.image_width = width; - desc.image_height = height; - desc.image_depth = depth; - desc.image_row_pitch = row_pitch; - desc.image_slice_pitch = slice_pitch; - desc.num_mip_levels = 0; - desc.num_samples = 0; - desc.buffer = 0; + cl_image_desc desc = + { + CL_MEM_OBJECT_IMAGE3D, + width, + height, + depth, + 0, // array size (unused) + row_pitch, + slice_pitch, + 0, 0, 0}; object_ = ::clCreateImage( context(), flags, @@ -4240,7 +4479,7 @@ public: &error); detail::errHandler(error, __CREATE_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4254,7 +4493,7 @@ public: slice_pitch, host_ptr, &error); detail::errHandler(error, __CREATE_IMAGE3D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4262,14 +4501,8 @@ public: #endif // #if !defined(CL_VERSION_1_2) || defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) } - //! \brief Default constructor - initializes to NULL. - Image3D() {} - - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image3D(const Image3D& image3D) : Image(image3D) {} + //! \brief Default constructor - initializes to nullptr. + Image3D() : Image() {} /*! \brief Constructor from cl_mem - takes ownership. * @@ -4277,19 +4510,6 @@ public: */ __CL_EXPLICIT_CONSTRUCTORS Image3D(const cl_mem& image3D) : Image(image3D) {} - /*! \brief Assignment from Image3D - performs shallow copy. - * - * See Memory for further details. - */ - Image3D& operator=(const Image3D& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -4299,6 +4519,36 @@ public: Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image3D(const Image3D& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image3D& operator=(const Image3D& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image3D(Image3D&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image3D& operator=(Image3D&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #if !defined(CL_VERSION_1_2) @@ -4321,10 +4571,10 @@ public: Image3DGL( const Context& context, cl_mem_flags flags, - GLenum target, - GLint miplevel, - GLuint texobj, - cl_int* err = NULL) + cl_GLenum target, + cl_GLint miplevel, + cl_GLuint texobj, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture3D( @@ -4336,40 +4586,21 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_3D_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Image3DGL() : Image3D() {} - /*! \brief Copy constructor - performs shallow copy. - * - * See Memory for further details. - */ - Image3DGL(const Image3DGL& image) : Image3D(image) {} - /*! \brief Constructor from cl_mem - takes ownership. * * See Memory for further details. */ __CL_EXPLICIT_CONSTRUCTORS Image3DGL(const cl_mem& image) : Image3D(image) {} - /*! \brief Assignment from Image3DGL - performs shallow copy. - * - * See Memory for further details. - */ - Image3DGL& operator=(const Image3DGL& rhs) - { - if (this != &rhs) - { - Image3D::operator=(rhs); - } - return *this; - } - /*! \brief Assignment from cl_mem - performs shallow copy. * * See Memory for further details. @@ -4379,6 +4610,36 @@ public: Image3D::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image3DGL(const Image3DGL& img) : Image3D(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Image3DGL& operator=(const Image3DGL& img) + { + Image3D::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Image3DGL(Image3DGL&& img) CL_HPP_NOEXCEPT : Image3D(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Image3DGL& operator=(Image3DGL&& img) + { + Image3D::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif // #if !defined(CL_VERSION_1_2) @@ -4395,10 +4656,10 @@ public: ImageGL( const Context& context, cl_mem_flags flags, - GLenum target, - GLint miplevel, - GLuint texobj, - cl_int* err = NULL) + cl_GLenum target, + cl_GLint miplevel, + cl_GLuint texobj, + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateFromGLTexture( @@ -4410,7 +4671,7 @@ public: &error); detail::errHandler(error, __CREATE_GL_TEXTURE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4418,27 +4679,191 @@ public: ImageGL() : Image() {} - ImageGL(const ImageGL& image) : Image(image) {} - __CL_EXPLICIT_CONSTRUCTORS ImageGL(const cl_mem& image) : Image(image) {} - ImageGL& operator=(const ImageGL& rhs) - { - if (this != &rhs) - { - Image::operator=(rhs); - } - return *this; - } - ImageGL& operator=(const cl_mem& rhs) { Image::operator=(rhs); return *this; } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + ImageGL(const ImageGL& img) : Image(img) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + ImageGL& operator=(const ImageGL& img) + { + Image::operator=(img); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + ImageGL(ImageGL&& img) CL_HPP_NOEXCEPT : Image(std::move(img)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + ImageGL& operator=(ImageGL&& img) + { + Image::operator=(std::move(img)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) }; #endif // #if defined(CL_VERSION_1_2) +/*! \brief Class interface for GL Render Buffer Memory Objects. +* +* This is provided to facilitate interoperability with OpenGL. +* +* See Memory for details about copy semantics, etc. +* +* \see Memory +*/ +class BufferRenderGL : +#if defined(CL_VERSION_1_2) + public ImageGL +#else // #if defined(CL_VERSION_1_2) + public Image2DGL +#endif //#if defined(CL_VERSION_1_2) +{ +public: + /*! \brief Constructs a BufferRenderGL in a specified context, from a given + * GL Renderbuffer. + * + * Wraps clCreateFromGLRenderbuffer(). + */ + BufferRenderGL( + const Context& context, + cl_mem_flags flags, + cl_GLuint bufobj, + cl_int* err = nullptr) + { + cl_int error; + object_ = ::clCreateFromGLRenderbuffer( + context(), + flags, + bufobj, + &error); + + detail::errHandler(error, __CREATE_GL_RENDER_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + } + + //! \brief Default constructor - initializes to nullptr. +#if defined(CL_VERSION_1_2) + BufferRenderGL() : ImageGL(){}; +#else // #if defined(CL_VERSION_1_2) + BufferRenderGL() : Image2DGL(){}; +#endif //#if defined(CL_VERSION_1_2) + + /*! \brief Constructor from cl_mem - takes ownership. + * + * See Memory for further details. + */ +#if defined(CL_VERSION_1_2) + __CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : ImageGL(buffer) + { + } +#else // #if defined(CL_VERSION_1_2) + __CL_EXPLICIT_CONSTRUCTORS BufferRenderGL(const cl_mem& buffer) : Image2DGL(buffer) + { + } +#endif //#if defined(CL_VERSION_1_2) + + + /*! \brief Assignment from cl_mem - performs shallow copy. + * + * See Memory for further details. + */ + BufferRenderGL& operator=(const cl_mem& rhs) + { +#if defined(CL_VERSION_1_2) + ImageGL::operator=(rhs); +#else // #if defined(CL_VERSION_1_2) + Image2DGL::operator=(rhs); +#endif //#if defined(CL_VERSION_1_2) + + return *this; + } + + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ +#if defined(CL_VERSION_1_2) + BufferRenderGL(const BufferRenderGL& buf) : ImageGL(buf) + { + } +#else // #if defined(CL_VERSION_1_2) + BufferRenderGL(const BufferRenderGL& buf) : Image2DGL(buf) + { + } +#endif //#if defined(CL_VERSION_1_2) + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + BufferRenderGL& operator=(const BufferRenderGL& rhs) + { +#if defined(CL_VERSION_1_2) + ImageGL::operator=(rhs); +#else // #if defined(CL_VERSION_1_2) + Image2DGL::operator=(rhs); +#endif //#if defined(CL_VERSION_1_2) + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ +#if defined(CL_VERSION_1_2) + BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : ImageGL(std::move(buf)) + { + } +#else // #if defined(CL_VERSION_1_2) + BufferRenderGL(BufferRenderGL&& buf) CL_HPP_NOEXCEPT : Image2DGL(std::move(buf)) + { + } +#endif //#if defined(CL_VERSION_1_2) + + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + BufferRenderGL& operator=(BufferRenderGL&& buf) + { +#if defined(CL_VERSION_1_2) + ImageGL::operator=(std::move(buf)); +#else // #if defined(CL_VERSION_1_2) + Image2DGL::operator=(std::move(buf)); +#endif //#if defined(CL_VERSION_1_2) + + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + + //! \brief Wrapper for clGetGLObjectInfo(). + cl_int getObjectInfo( + cl_gl_object_type* type, + cl_GLuint* gl_object_name) + { + return detail::errHandler( + ::clGetGLObjectInfo(object_, type, gl_object_name), + __GET_GL_OBJECT_INFO_ERR); + } +}; + /*! \brief Class interface for cl_sampler. * * \note Copies of these objects are shallow, meaning that the copy will refer @@ -4450,13 +4875,7 @@ public: class Sampler : public detail::Wrapper { public: - /*! \brief Destructor. - * - * This calls clReleaseSampler() on the value held by this instance. - */ - ~Sampler() {} - - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Sampler() {} /*! \brief Constructs a Sampler in a specified context. @@ -4468,7 +4887,7 @@ public: cl_bool normalized_coords, cl_addressing_mode addressing_mode, cl_filter_mode filter_mode, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateSampler( @@ -4479,38 +4898,18 @@ public: &error); detail::errHandler(error, __CREATE_SAMPLER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - /*! \brief Copy constructor - performs shallow copy. - * - * This calls clRetainSampler() on the parameter's cl_sampler. - */ - Sampler(const Sampler& sampler) : detail::Wrapper(sampler) {} - /*! \brief Constructor from cl_sampler - takes ownership. * * This effectively transfers ownership of a refcount on the cl_sampler * into the new Sampler object. */ - Sampler(const cl_sampler& sampler) : detail::Wrapper(sampler) {} - - /*! \brief Assignment operator from Sampler. - * - * This calls clRetainSampler() on the parameter and clReleaseSampler() - * on the previous value held by this instance. - */ - Sampler& operator=(const Sampler& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } + __CL_EXPLICIT_CONSTRUCTORS Sampler(const cl_sampler& sampler) : detail::Wrapper(sampler) {} /*! \brief Assignment operator from cl_sampler - takes ownership. * @@ -4523,6 +4922,36 @@ public: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Sampler(const Sampler& sam) : detail::Wrapper(sam) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Sampler& operator=(const Sampler& sam) + { + detail::Wrapper::operator=(sam); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Sampler(Sampler&& sam) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(sam)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Sampler& operator=(Sampler&& sam) + { + detail::Wrapper::operator=(std::move(sam)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + //! \brief Wrapper for clGetSamplerInfo(). template cl_int getInfo(cl_sampler_info name, T* param) const @@ -4535,12 +4964,12 @@ public: //! \brief Wrapper for clGetSamplerInfo() that returns by value. template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_sampler_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -4618,14 +5047,14 @@ template struct KernelArgumentHandler { static ::size_t size(const T&) { return sizeof(T); } - static T* ptr(T& value) { return &value; } + static const T* ptr(const T& value) { return &value; } }; template <> struct KernelArgumentHandler { static ::size_t size(const LocalSpaceArg& value) { return value.size_; } - static void* ptr(LocalSpaceArg&) { return NULL; } + static const void* ptr(const LocalSpaceArg&) { return nullptr; } }; } // namespace detail @@ -4667,23 +5096,11 @@ Local(::size_t size) class Kernel : public detail::Wrapper { public: - inline Kernel(const Program& program, const char* name, cl_int* err = NULL); + inline Kernel(const Program& program, const char* name, cl_int* err = nullptr); - /*! \brief Destructor. - * - * This calls clReleaseKernel() on the value held by this instance. - */ - ~Kernel() {} - - //! \brief Default constructor - initializes to NULL. + //! \brief Default constructor - initializes to nullptr. Kernel() {} - /*! \brief Copy constructor - performs shallow copy. - * - * This calls clRetainKernel() on the parameter's cl_kernel. - */ - Kernel(const Kernel& kernel) : detail::Wrapper(kernel) {} - /*! \brief Constructor from cl_kernel - takes ownership. * * This effectively transfers ownership of a refcount on the cl_kernel @@ -4691,20 +5108,6 @@ public: */ __CL_EXPLICIT_CONSTRUCTORS Kernel(const cl_kernel& kernel) : detail::Wrapper(kernel) {} - /*! \brief Assignment operator from Kernel. - * - * This calls clRetainKernel() on the parameter and clReleaseKernel() - * on the previous value held by this instance. - */ - Kernel& operator=(const Kernel& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } - /*! \brief Assignment operator from cl_kernel - takes ownership. * * This effectively transfers ownership of a refcount on the rhs and calls @@ -4716,6 +5119,36 @@ public: return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Kernel(const Kernel& kernel) : detail::Wrapper(kernel) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Kernel& operator=(const Kernel& kernel) + { + detail::Wrapper::operator=(kernel); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Kernel(Kernel&& kernel) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(kernel)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Kernel& operator=(Kernel&& kernel) + { + detail::Wrapper::operator=(std::move(kernel)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + template cl_int getInfo(cl_kernel_info name, T* param) const { @@ -4726,12 +5159,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -4749,12 +5182,12 @@ public: template typename detail::param_traits::param_type - getArgInfo(cl_uint argIndex, cl_int* err = NULL) const + getArgInfo(cl_uint argIndex, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_arg_info, name>::param_type param; cl_int result = getArgInfo(argIndex, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -4774,12 +5207,12 @@ public: template typename detail::param_traits::param_type - getWorkGroupInfo(const Device& device, cl_int* err = NULL) const + getWorkGroupInfo(const Device& device, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_kernel_work_group_info, name>::param_type param; cl_int result = getWorkGroupInfo(device, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -4787,7 +5220,7 @@ public: } template - cl_int setArg(cl_uint index, T value) + cl_int setArg(cl_uint index, const T& value) { return detail::errHandler( ::clSetKernelArg( @@ -4798,7 +5231,7 @@ public: __SET_KERNEL_ARGS_ERR); } - cl_int setArg(cl_uint index, ::size_t size, void* argPtr) + cl_int setArg(cl_uint index, ::size_t size, const void* argPtr) { return detail::errHandler( ::clSetKernelArg(object_, index, size, argPtr), @@ -4817,43 +5250,8 @@ public: Program( const STRING_CLASS& source, - cl_int* err = NULL) - { - cl_int error; - - const char* strings = source.c_str(); - const ::size_t length = source.size(); - - Context context = Context::getDefault(err); - - object_ = ::clCreateProgramWithSource( - context(), (cl_uint)1, &strings, &length, &error); - - detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); - - if (error == CL_SUCCESS) - { - error = ::clBuildProgram( - object_, - 0, - NULL, - "", - NULL, - NULL); - - detail::errHandler(error, __BUILD_PROGRAM_ERR); - } - - if (err != NULL) - { - *err = error; - } - } - - Program( - const STRING_CLASS& source, - bool build, - cl_int* err = NULL) + bool build = false, + cl_int* err = nullptr) { cl_int error; @@ -4872,15 +5270,15 @@ public: error = ::clBuildProgram( object_, 0, - NULL, + nullptr, "", - NULL, - NULL); + nullptr, + nullptr); detail::errHandler(error, __BUILD_PROGRAM_ERR); } - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4890,7 +5288,7 @@ public: const Context& context, const STRING_CLASS& source, bool build = false, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -4907,15 +5305,15 @@ public: error = ::clBuildProgram( object_, 0, - NULL, + nullptr, "", - NULL, - NULL); + nullptr, + nullptr); detail::errHandler(error, __BUILD_PROGRAM_ERR); } - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4924,7 +5322,7 @@ public: Program( const Context& context, const Sources& sources, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -4942,7 +5340,7 @@ public: context(), (cl_uint)n, strings, lengths, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_SOURCE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -4957,12 +5355,12 @@ public: * match the size of binaries and filled with values to specify if each binary * was successfully loaded. * Set to CL_SUCCESS if the binary was successfully loaded. - * Set to CL_INVALID_VALUE if the length is 0 or the binary pointer is NULL. + * Set to CL_INVALID_VALUE if the length is 0 or the binary pointer is nullptr. * Set to CL_INVALID_BINARY if the binary provided is not valid for the matching device. - * \param err if non-NULL will be set to CL_SUCCESS on successful operation or one of the following errors: + * \param err if non-nullptr will be set to CL_SUCCESS on successful operation or one of the following errors: * CL_INVALID_CONTEXT if context is not a valid context. * CL_INVALID_VALUE if the length of devices is zero; or if the length of binaries does not match the length of devices; - * or if any entry in binaries is NULL or has length 0. + * or if any entry in binaries is nullptr or has length 0. * CL_INVALID_DEVICE if OpenCL devices listed in devices are not in the list of devices associated with context. * CL_INVALID_BINARY if an invalid program binary was encountered for any device. binaryStatus will return specific status for each device. * CL_OUT_OF_HOST_MEMORY if there is a failure to allocate resources required by the OpenCL implementation on the host. @@ -4971,8 +5369,8 @@ public: const Context& context, const VECTOR_CLASS& devices, const Binaries& binaries, - VECTOR_CLASS* binaryStatus = NULL, - cl_int* err = NULL) + VECTOR_CLASS* binaryStatus = nullptr, + cl_int* err = nullptr) { cl_int error; @@ -4983,7 +5381,7 @@ public: { error = CL_INVALID_VALUE; detail::errHandler(error, __CREATE_PROGRAM_WITH_BINARY_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5013,10 +5411,10 @@ public: object_ = ::clCreateProgramWithBinary( context(), (cl_uint)devices.size(), deviceIDs, - lengths, images, binaryStatus != NULL ? &binaryStatus->front() : NULL, &error); + lengths, images, (binaryStatus != nullptr && numDevices > 0) ? &binaryStatus->front() : nullptr, &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_BINARY_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5032,7 +5430,7 @@ public: const Context& context, const VECTOR_CLASS& devices, const STRING_CLASS& kernelNames, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; @@ -5052,7 +5450,7 @@ public: &error); detail::errHandler(error, __CREATE_PROGRAM_WITH_BUILT_IN_KERNELS_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5063,30 +5461,49 @@ public: { } - Program(const Program& program) : detail::Wrapper(program) {} - __CL_EXPLICIT_CONSTRUCTORS Program(const cl_program& program) : detail::Wrapper(program) {} - Program& operator=(const Program& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } - Program& operator=(const cl_program& rhs) { detail::Wrapper::operator=(rhs); return *this; } + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + Program(const Program& program) : detail::Wrapper(program) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + Program& operator=(const Program& program) + { + detail::Wrapper::operator=(program); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + Program(Program&& program) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(program)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + Program& operator=(Program&& program) + { + detail::Wrapper::operator=(std::move(program)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + cl_int build( const VECTOR_CLASS& devices, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { ::size_t numDevices = devices.size(); cl_device_id* deviceIDs = (cl_device_id*)alloca(numDevices * sizeof(cl_device_id)); @@ -5108,15 +5525,15 @@ public: } cl_int build( - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { return detail::errHandler( ::clBuildProgram( object_, 0, - NULL, + nullptr, options, notifyFptr, data), @@ -5125,19 +5542,19 @@ public: #if defined(CL_VERSION_1_2) cl_int compile( - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL) const + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr) const { return detail::errHandler( ::clCompileProgram( object_, 0, - NULL, + nullptr, options, 0, - NULL, - NULL, + nullptr, + nullptr, notifyFptr, data), __COMPILE_PROGRAM_ERR); @@ -5154,12 +5571,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_program_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5178,12 +5595,12 @@ public: template typename detail::param_traits::param_type - getBuildInfo(const Device& device, cl_int* err = NULL) const + getBuildInfo(const Device& device, cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_program_build_info, name>::param_type param; cl_int result = getBuildInfo(device, name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5193,7 +5610,7 @@ public: cl_int createKernels(VECTOR_CLASS* kernels) { cl_uint numKernels; - cl_int err = ::clCreateKernelsInProgram(object_, 0, NULL, &numKernels); + cl_int err = ::clCreateKernelsInProgram(object_, 0, nullptr, &numKernels); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); @@ -5201,7 +5618,7 @@ public: Kernel* value = (Kernel*)alloca(numKernels * sizeof(Kernel)); err = ::clCreateKernelsInProgram( - object_, numKernels, (cl_kernel*)value, NULL); + object_, numKernels, (cl_kernel*)value, nullptr); if (err != CL_SUCCESS) { return detail::errHandler(err, __CREATE_KERNELS_IN_PROGRAM_ERR); @@ -5216,32 +5633,36 @@ public: inline Program linkProgram( Program input1, Program input2, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { - cl_int err_local = CL_SUCCESS; + cl_int error_local = CL_SUCCESS; cl_program programs[2] = {input1(), input2()}; - Context ctx = input1.getInfo(); + Context ctx = input1.getInfo(&error_local); + if (error_local != CL_SUCCESS) + { + detail::errHandler(error_local, __LINK_PROGRAM_ERR); + } cl_program prog = ::clLinkProgram( ctx(), 0, - NULL, + nullptr, options, 2, programs, notifyFptr, data, - &err_local); + &error_local); - detail::errHandler(err_local, __COMPILE_PROGRAM_ERR); - if (err != NULL) + detail::errHandler(error_local, __COMPILE_PROGRAM_ERR); + if (err != nullptr) { - *err = err_local; + *err = error_local; } return Program(prog); @@ -5249,16 +5670,16 @@ inline Program linkProgram( inline Program linkProgram( VECTOR_CLASS inputPrograms, - const char* options = NULL, - void(CL_CALLBACK* notifyFptr)(cl_program, void*) = NULL, - void* data = NULL, - cl_int* err = NULL) + const char* options = nullptr, + void(CL_CALLBACK* notifyFptr)(cl_program, void*) = nullptr, + void* data = nullptr, + cl_int* err = nullptr) { - cl_int err_local = CL_SUCCESS; + cl_int error_local = CL_SUCCESS; cl_program* programs = (cl_program*)alloca(inputPrograms.size() * sizeof(cl_program)); - if (programs != NULL) + if (programs != nullptr) { for (unsigned int i = 0; i < inputPrograms.size(); i++) { @@ -5266,21 +5687,30 @@ inline Program linkProgram( } } + Context ctx; + if (inputPrograms.size() > 0) + { + ctx = inputPrograms[0].getInfo(&error_local); + if (error_local != CL_SUCCESS) + { + detail::errHandler(error_local, __LINK_PROGRAM_ERR); + } + } cl_program prog = ::clLinkProgram( - Context::getDefault()(), + ctx(), 0, - NULL, + nullptr, options, (cl_uint)inputPrograms.size(), programs, notifyFptr, data, - &err_local); + &error_local); - detail::errHandler(err_local, __COMPILE_PROGRAM_ERR); - if (err != NULL) + detail::errHandler(error_local, __COMPILE_PROGRAM_ERR); + if (err != nullptr) { - *err = err_local; + *err = error_local; } return Program(prog); @@ -5294,14 +5724,14 @@ inline VECTOR_CLASS cl::Program::getInfo(cl_int* err VECTOR_CLASS binaries; for (VECTOR_CLASS< ::size_t>::iterator s = sizes.begin(); s != sizes.end(); ++s) { - char* ptr = NULL; + char* ptr = nullptr; if (*s != 0) ptr = new char[*s]; binaries.push_back(ptr); } cl_int result = getInfo(CL_PROGRAM_BINARIES, &binaries); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5315,7 +5745,7 @@ inline Kernel::Kernel(const Program& program, const char* name, cl_int* err) object_ = ::clCreateKernel(program(), name, &error); detail::errHandler(error, __CREATE_KERNEL_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5327,23 +5757,27 @@ inline Kernel::Kernel(const Program& program, const char* name, cl_int* err) class CommandQueue : public detail::Wrapper { private: +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED + static std::atomic default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED static volatile int default_initialized_; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED static CommandQueue default_; static volatile cl_int default_error_; public: CommandQueue( cl_command_queue_properties properties, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; Context context = Context::getDefault(&error); - detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); + detail::errHandler(error, __CREATE_CONTEXT_ERR); if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5356,31 +5790,93 @@ public: context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } } + /*! + * \brief Constructs a CommandQueue for an implementation defined device in the given context + */ + explicit CommandQueue( + const Context& context, + cl_command_queue_properties properties = 0, + cl_int* err = nullptr) + { + cl_int error; + VECTOR_CLASS devices; + error = context.getInfo(CL_CONTEXT_DEVICES, &devices); + + detail::errHandler(error, __CREATE_CONTEXT_ERR); + + if (error != CL_SUCCESS) + { + if (err != nullptr) + { + *err = error; + } + return; + } + + object_ = ::clCreateCommandQueue(context(), devices[0](), properties, &error); + + detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); + + if (err != nullptr) + { + *err = error; + } + } CommandQueue( const Context& context, const Device& device, cl_command_queue_properties properties = 0, - cl_int* err = NULL) + cl_int* err = nullptr) { cl_int error; object_ = ::clCreateCommandQueue( context(), device(), properties, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } } - static CommandQueue getDefault(cl_int* err = NULL) + /*! \brief Copy constructor to forward copy to the superclass correctly. + * Required for MSVC. + */ + CommandQueue(const CommandQueue& queue) : detail::Wrapper(queue) {} + + /*! \brief Copy assignment to forward copy to the superclass correctly. + * Required for MSVC. + */ + CommandQueue& operator=(const CommandQueue& queue) + { + detail::Wrapper::operator=(queue); + return *this; + } + +#if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + /*! \brief Move constructor to forward move to the superclass correctly. + * Required for MSVC. + */ + CommandQueue(CommandQueue&& queue) CL_HPP_NOEXCEPT : detail::Wrapper(std::move(queue)) {} + + /*! \brief Move assignment to forward move to the superclass correctly. + * Required for MSVC. + */ + CommandQueue& operator=(CommandQueue&& queue) + { + detail::Wrapper::operator=(std::move(queue)); + return *this; + } +#endif // #if defined(CL_HPP_RVALUE_REFERENCES_SUPPORTED) + + static CommandQueue getDefault(cl_int* err = nullptr) { int state = detail::compare_exchange( &default_initialized_, @@ -5388,7 +5884,7 @@ public: if (state & __DEFAULT_INITIALIZED) { - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5403,7 +5899,7 @@ public: detail::fence(); } - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5417,7 +5913,7 @@ public: if (error != CL_SUCCESS) { - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5429,7 +5925,7 @@ public: default_ = CommandQueue(context, device, 0, &error); detail::errHandler(error, __CREATE_COMMAND_QUEUE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -5443,7 +5939,7 @@ public: detail::fence(); - if (err != NULL) + if (err != nullptr) { *err = default_error_; } @@ -5452,18 +5948,7 @@ public: CommandQueue() {} - CommandQueue(const CommandQueue& commandQueue) : detail::Wrapper(commandQueue) {} - - CommandQueue(const cl_command_queue& commandQueue) : detail::Wrapper(commandQueue) {} - - CommandQueue& operator=(const CommandQueue& rhs) - { - if (this != &rhs) - { - detail::Wrapper::operator=(rhs); - } - return *this; - } + __CL_EXPLICIT_CONSTRUCTORS CommandQueue(const cl_command_queue& commandQueue) : detail::Wrapper(commandQueue) {} CommandQueue& operator=(const cl_command_queue& rhs) { @@ -5482,12 +5967,12 @@ public: template typename detail::param_traits::param_type - getInfo(cl_int* err = NULL) const + getInfo(cl_int* err = nullptr) const { typename detail::param_traits< detail::cl_command_queue_info, name>::param_type param; cl_int result = getInfo(name, ¶m); - if (err != NULL) + if (err != nullptr) { *err = result; } @@ -5500,20 +5985,20 @@ public: ::size_t offset, ::size_t size, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReadBuffer( object_, buffer(), blocking, offset, size, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5525,20 +6010,20 @@ public: ::size_t offset, ::size_t size, const void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueWriteBuffer( object_, buffer(), blocking, offset, size, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5550,19 +6035,19 @@ public: ::size_t src_offset, ::size_t dst_offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyBuffer( object_, src(), dst(), src_offset, dst_offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQEUE_COPY_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5579,8 +6064,8 @@ public: ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5596,12 +6081,12 @@ public: host_row_pitch, host_slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5618,8 +6103,8 @@ public: ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5635,12 +6120,12 @@ public: host_row_pitch, host_slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5656,8 +6141,8 @@ public: ::size_t src_slice_pitch, ::size_t dst_row_pitch, ::size_t dst_slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5672,12 +6157,12 @@ public: src_slice_pitch, dst_row_pitch, dst_slice_pitch, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQEUE_COPY_BUFFER_RECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5696,8 +6181,8 @@ public: PatternType pattern, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5708,12 +6193,12 @@ public: sizeof(PatternType), offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5728,20 +6213,20 @@ public: ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReadImage( object_, image(), blocking, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_READ_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5755,20 +6240,20 @@ public: ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueWriteImage( object_, image(), blocking, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_WRITE_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5780,20 +6265,20 @@ public: const size_t<3>& src_origin, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyImage( object_, src(), dst(), (const ::size_t*)src_origin, (const ::size_t*)dst_origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5812,8 +6297,8 @@ public: cl_float4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5823,12 +6308,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5846,8 +6331,8 @@ public: cl_int4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5857,12 +6342,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5880,8 +6365,8 @@ public: cl_uint4 fillColor, const size_t<3>& origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( @@ -5891,12 +6376,12 @@ public: static_cast(&fillColor), (const ::size_t*)origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_FILL_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5909,20 +6394,20 @@ public: const size_t<3>& src_origin, const size_t<3>& region, ::size_t dst_offset, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyImageToBuffer( object_, src(), dst(), (const ::size_t*)src_origin, (const ::size_t*)region, dst_offset, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_IMAGE_TO_BUFFER_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5934,20 +6419,20 @@ public: ::size_t src_offset, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueCopyBufferToImage( object_, src(), dst(), src_offset, (const ::size_t*)dst_origin, (const ::size_t*)region, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_COPY_BUFFER_TO_IMAGE_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -5959,23 +6444,27 @@ public: cl_map_flags flags, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) const { + cl_event tmp; cl_int error; void* result = ::clEnqueueMapBuffer( object_, buffer(), blocking, flags, offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (cl_event*)event, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr, &error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } + if (event != nullptr && error == CL_SUCCESS) + *event = tmp; + return result; } @@ -5987,44 +6476,47 @@ public: const size_t<3>& region, ::size_t* row_pitch, ::size_t* slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) const { + cl_event tmp; cl_int error; void* result = ::clEnqueueMapImage( object_, buffer(), blocking, flags, (const ::size_t*)origin, (const ::size_t*)region, row_pitch, slice_pitch, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (cl_event*)event, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr, &error); detail::errHandler(error, __ENQUEUE_MAP_IMAGE_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } + if (event != nullptr && error == CL_SUCCESS) + *event = tmp; return result; } cl_int enqueueUnmapMemObject( const Memory& memory, void* mapped_ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueUnmapMemObject( object_, memory(), mapped_ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6050,12 +6542,12 @@ public: cl_int err = detail::errHandler( ::clEnqueueMarkerWithWaitList( object_, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_MARKER_WAIT_LIST_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6080,12 +6572,12 @@ public: cl_int err = detail::errHandler( ::clEnqueueBarrierWithWaitList( object_, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_BARRIER_WAIT_LIST_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6098,8 +6590,8 @@ public: cl_int enqueueMigrateMemObjects( const VECTOR_CLASS& memObjects, cl_mem_migration_flags flags, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_event tmp; @@ -6116,12 +6608,12 @@ public: (cl_uint)memObjects.size(), static_cast(localMemObjects), flags, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6133,22 +6625,22 @@ public: const NDRange& offset, const NDRange& global, const NDRange& local = NullRange, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueNDRangeKernel( object_, kernel(), (cl_uint)global.dimensions(), - offset.dimensions() != 0 ? (const ::size_t*)offset : NULL, + offset.dimensions() != 0 ? (const ::size_t*)offset : nullptr, (const ::size_t*)global, - local.dimensions() != 0 ? (const ::size_t*)local : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + local.dimensions() != 0 ? (const ::size_t*)local : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_NDRANGE_KERNEL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6156,19 +6648,19 @@ public: cl_int enqueueTask( const Kernel& kernel, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueTask( object_, kernel(), - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_TASK_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6177,16 +6669,16 @@ public: cl_int enqueueNativeKernel( void(CL_CALLBACK* userFptr)(void*), std::pair args, - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* mem_locs = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* mem_locs = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - cl_mem* mems = (mem_objects != NULL && mem_objects->size() > 0) + cl_mem* mems = (mem_objects != nullptr && mem_objects->size() > 0) ? (cl_mem*)alloca(mem_objects->size() * sizeof(cl_mem)) - : NULL; + : nullptr; - if (mems != NULL) + if (mems != nullptr) { for (unsigned int i = 0; i < mem_objects->size(); i++) { @@ -6198,15 +6690,15 @@ public: cl_int err = detail::errHandler( ::clEnqueueNativeKernel( object_, userFptr, args.first, args.second, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, mems, - (mem_locs != NULL) ? (const void**)&mem_locs->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_locs != nullptr && mem_locs->size() > 0) ? (const void**)&mem_locs->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_NATIVE_KERNEL); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6217,11 +6709,19 @@ public: */ #if defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS) || (defined(CL_VERSION_1_1) && !defined(CL_VERSION_1_2)) CL_EXT_PREFIX__VERSION_1_1_DEPRECATED - cl_int enqueueMarker(Event* event = NULL) const CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED + cl_int enqueueMarker(Event* event = nullptr) const CL_EXT_SUFFIX__VERSION_1_1_DEPRECATED { - return detail::errHandler( - ::clEnqueueMarker(object_, (cl_event*)event), + cl_event tmp; + cl_int err = detail::errHandler( + ::clEnqueueMarker( + object_, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_MARKER_ERR); + + if (event != nullptr && err == CL_SUCCESS) + *event = tmp; + + return err; } CL_EXT_PREFIX__VERSION_1_1_DEPRECATED @@ -6231,50 +6731,50 @@ public: ::clEnqueueWaitForEvents( object_, (cl_uint)events.size(), - (const cl_event*)&events.front()), + events.size() > 0 ? (const cl_event*)&events.front() : nullptr), __ENQUEUE_WAIT_FOR_EVENTS_ERR); } #endif // #if defined(CL_VERSION_1_1) cl_int enqueueAcquireGLObjects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueAcquireGLObjects( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_ACQUIRE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; } cl_int enqueueReleaseGLObjects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { cl_event tmp; cl_int err = detail::errHandler( ::clEnqueueReleaseGLObjects( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_RELEASE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6291,11 +6791,11 @@ public: const cl_event* event_wait_list, cl_event* event); cl_int enqueueAcquireD3D10Objects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - static PFN_clEnqueueAcquireD3D10ObjectsKHR pfn_clEnqueueAcquireD3D10ObjectsKHR = NULL; + static PFN_clEnqueueAcquireD3D10ObjectsKHR pfn_clEnqueueAcquireD3D10ObjectsKHR = nullptr; #if defined(CL_VERSION_1_2) cl_context context = getInfo(); cl::Device device(getInfo()); @@ -6310,25 +6810,25 @@ public: cl_int err = detail::errHandler( pfn_clEnqueueAcquireD3D10ObjectsKHR( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_ACQUIRE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; } cl_int enqueueReleaseD3D10Objects( - const VECTOR_CLASS* mem_objects = NULL, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) const + const VECTOR_CLASS* mem_objects = nullptr, + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) const { - static PFN_clEnqueueReleaseD3D10ObjectsKHR pfn_clEnqueueReleaseD3D10ObjectsKHR = NULL; + static PFN_clEnqueueReleaseD3D10ObjectsKHR pfn_clEnqueueReleaseD3D10ObjectsKHR = nullptr; #if defined(CL_VERSION_1_2) cl_context context = getInfo(); cl::Device device(getInfo()); @@ -6343,14 +6843,14 @@ public: cl_int err = detail::errHandler( pfn_clEnqueueReleaseD3D10ObjectsKHR( object_, - (mem_objects != NULL) ? (cl_uint)mem_objects->size() : 0, - (mem_objects != NULL) ? (const cl_mem*)&mem_objects->front() : NULL, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (mem_objects != nullptr) ? (cl_uint)mem_objects->size() : 0, + (mem_objects != nullptr && mem_objects->size() > 0) ? (const cl_mem*)&mem_objects->front() : nullptr, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_RELEASE_GL_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6382,14 +6882,139 @@ public: }; #ifdef _WIN32 +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED +__declspec(selectany) std::atomic CommandQueue::default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED __declspec(selectany) volatile int CommandQueue::default_initialized_ = __DEFAULT_NOT_INITIALIZED; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED __declspec(selectany) CommandQueue CommandQueue::default_; __declspec(selectany) volatile cl_int CommandQueue::default_error_ = CL_SUCCESS; -#else +#else // !_WIN32 +#ifdef CL_HPP_CPP11_ATOMICS_SUPPORTED +__attribute__((weak)) std::atomic CommandQueue::default_initialized_; +#else // !CL_HPP_CPP11_ATOMICS_SUPPORTED __attribute__((weak)) volatile int CommandQueue::default_initialized_ = __DEFAULT_NOT_INITIALIZED; +#endif // !CL_HPP_CPP11_ATOMICS_SUPPORTED __attribute__((weak)) CommandQueue CommandQueue::default_; __attribute__((weak)) volatile cl_int CommandQueue::default_error_ = CL_SUCCESS; -#endif +#endif // !_WIN32 + +template +Buffer::Buffer( + const Context& context, + IteratorType startIterator, + IteratorType endIterator, + bool readOnly, + bool useHostPtr, + cl_int* err) +{ + typedef typename std::iterator_traits::value_type DataType; + cl_int error; + + cl_mem_flags flags = 0; + if (readOnly) + { + flags |= CL_MEM_READ_ONLY; + } + else + { + flags |= CL_MEM_READ_WRITE; + } + if (useHostPtr) + { + flags |= CL_MEM_USE_HOST_PTR; + } + + ::size_t size = sizeof(DataType) * (endIterator - startIterator); + + if (useHostPtr) + { + object_ = ::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); + } + else + { + object_ = ::clCreateBuffer(context(), flags, size, 0, &error); + } + + detail::errHandler(error, __CREATE_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + + if (!useHostPtr) + { + CommandQueue queue(context, 0, &error); + detail::errHandler(error, __CREATE_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + + error = cl::copy(queue, startIterator, endIterator, *this); + detail::errHandler(error, __CREATE_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + } +} + +template +Buffer::Buffer( + const CommandQueue& queue, + IteratorType startIterator, + IteratorType endIterator, + bool readOnly, + bool useHostPtr, + cl_int* err) +{ + typedef typename std::iterator_traits::value_type DataType; + cl_int error; + + cl_mem_flags flags = 0; + if (readOnly) + { + flags |= CL_MEM_READ_ONLY; + } + else + { + flags |= CL_MEM_READ_WRITE; + } + if (useHostPtr) + { + flags |= CL_MEM_USE_HOST_PTR; + } + + ::size_t size = sizeof(DataType) * (endIterator - startIterator); + + Context context = queue.getInfo(); + + if (useHostPtr) + { + object_ = ::clCreateBuffer(context(), flags, size, static_cast(&*startIterator), &error); + } + else + { + object_ = ::clCreateBuffer(context(), flags, size, 0, &error); + } + + detail::errHandler(error, __CREATE_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + + if (!useHostPtr) + { + error = cl::copy(queue, startIterator, endIterator, *this); + detail::errHandler(error, __CREATE_BUFFER_ERR); + if (err != nullptr) + { + *err = error; + } + } +} inline cl_int enqueueReadBuffer( const Buffer& buffer, @@ -6397,8 +7022,8 @@ inline cl_int enqueueReadBuffer( ::size_t offset, ::size_t size, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6417,8 +7042,8 @@ inline cl_int enqueueWriteBuffer( ::size_t offset, ::size_t size, const void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6437,27 +7062,27 @@ inline void* enqueueMapBuffer( cl_map_flags flags, ::size_t offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL, - cl_int* err = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr, + cl_int* err = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } void* result = ::clEnqueueMapBuffer( queue(), buffer(), blocking, flags, offset, size, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, (cl_event*)event, &error); detail::errHandler(error, __ENQUEUE_MAP_BUFFER_ERR); - if (err != NULL) + if (err != nullptr) { *err = error; } @@ -6467,8 +7092,8 @@ inline void* enqueueMapBuffer( inline cl_int enqueueUnmapMemObject( const Memory& memory, void* mapped_ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6482,12 +7107,12 @@ inline cl_int enqueueUnmapMemObject( cl_int err = detail::errHandler( ::clEnqueueUnmapMemObject( queue(), memory(), mapped_ptr, - (events != NULL) ? (cl_uint)events->size() : 0, - (events != NULL && events->size() > 0) ? (cl_event*)&events->front() : NULL, - (event != NULL) ? &tmp : NULL), + (events != nullptr) ? (cl_uint)events->size() : 0, + (events != nullptr && events->size() > 0) ? (cl_event*)&events->front() : nullptr, + (event != nullptr) ? &tmp : nullptr), __ENQUEUE_UNMAP_MEM_OBJECT_ERR); - if (event != NULL && err == CL_SUCCESS) + if (event != nullptr && err == CL_SUCCESS) *event = tmp; return err; @@ -6499,8 +7124,8 @@ inline cl_int enqueueCopyBuffer( ::size_t src_offset, ::size_t dst_offset, ::size_t size, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6515,9 +7140,43 @@ inline cl_int enqueueCopyBuffer( /** * Blocking copy operation between iterators and a buffer. + * Host to Device. + * Uses default command queue. */ template inline cl_int copy(IteratorType startIterator, IteratorType endIterator, cl::Buffer& buffer) +{ + cl_int error; + CommandQueue queue = CommandQueue::getDefault(&error); + if (error != CL_SUCCESS) + return error; + + return cl::copy(queue, startIterator, endIterator, buffer); +} + +/** + * Blocking copy operation between iterators and a buffer. + * Device to Host. + * Uses default command queue. + */ +template +inline cl_int copy(const cl::Buffer& buffer, IteratorType startIterator, IteratorType endIterator) +{ + cl_int error; + CommandQueue queue = CommandQueue::getDefault(&error); + if (error != CL_SUCCESS) + return error; + + return cl::copy(queue, buffer, startIterator, endIterator); +} + +/** + * Blocking copy operation between iterators and a buffer. + * Host to Device. + * Uses specified queue. + */ +template +inline cl_int copy(const CommandQueue& queue, IteratorType startIterator, IteratorType endIterator, cl::Buffer& buffer) { typedef typename std::iterator_traits::value_type DataType; cl_int error; @@ -6526,7 +7185,7 @@ inline cl_int copy(IteratorType startIterator, IteratorType endIterator, cl::Buf ::size_t byteLength = length * sizeof(DataType); DataType* pointer = - static_cast(enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_WRITE, 0, byteLength, 0, 0, &error)); + static_cast(queue.enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_WRITE, 0, byteLength, 0, 0, &error)); // if exceptions enabled, enqueueMapBuffer will throw if (error != CL_SUCCESS) { @@ -6542,7 +7201,7 @@ inline cl_int copy(IteratorType startIterator, IteratorType endIterator, cl::Buf std::copy(startIterator, endIterator, pointer); #endif Event endEvent; - error = enqueueUnmapMemObject(buffer, pointer, 0, &endEvent); + error = queue.enqueueUnmapMemObject(buffer, pointer, 0, &endEvent); // if exceptions enabled, enqueueUnmapMemObject will throw if (error != CL_SUCCESS) { @@ -6554,9 +7213,11 @@ inline cl_int copy(IteratorType startIterator, IteratorType endIterator, cl::Buf /** * Blocking copy operation between iterators and a buffer. + * Device to Host. + * Uses specified queue. */ template -inline cl_int copy(const cl::Buffer& buffer, IteratorType startIterator, IteratorType endIterator) +inline cl_int copy(const CommandQueue& queue, const cl::Buffer& buffer, IteratorType startIterator, IteratorType endIterator) { typedef typename std::iterator_traits::value_type DataType; cl_int error; @@ -6565,7 +7226,7 @@ inline cl_int copy(const cl::Buffer& buffer, IteratorType startIterator, Iterato ::size_t byteLength = length * sizeof(DataType); DataType* pointer = - static_cast(enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_READ, 0, byteLength, 0, 0, &error)); + static_cast(queue.enqueueMapBuffer(buffer, CL_TRUE, CL_MAP_READ, 0, byteLength, 0, 0, &error)); // if exceptions enabled, enqueueMapBuffer will throw if (error != CL_SUCCESS) { @@ -6573,7 +7234,7 @@ inline cl_int copy(const cl::Buffer& buffer, IteratorType startIterator, Iterato } std::copy(pointer, pointer + length, startIterator); Event endEvent; - error = enqueueUnmapMemObject(buffer, pointer, 0, &endEvent); + error = queue.enqueueUnmapMemObject(buffer, pointer, 0, &endEvent); // if exceptions enabled, enqueueUnmapMemObject will throw if (error != CL_SUCCESS) { @@ -6595,8 +7256,8 @@ inline cl_int enqueueReadBufferRect( ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6632,8 +7293,8 @@ inline cl_int enqueueWriteBufferRect( ::size_t host_row_pitch, ::size_t host_slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6668,8 +7329,8 @@ inline cl_int enqueueCopyBufferRect( ::size_t src_slice_pitch, ::size_t dst_row_pitch, ::size_t dst_slice_pitch, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6702,8 +7363,8 @@ inline cl_int enqueueReadImage( ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6733,8 +7394,8 @@ inline cl_int enqueueWriteImage( ::size_t row_pitch, ::size_t slice_pitch, void* ptr, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6762,8 +7423,8 @@ inline cl_int enqueueCopyImage( const size_t<3>& src_origin, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6789,8 +7450,8 @@ inline cl_int enqueueCopyImageToBuffer( const size_t<3>& src_origin, const size_t<3>& region, ::size_t dst_offset, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -6816,8 +7477,8 @@ inline cl_int enqueueCopyBufferToImage( ::size_t src_offset, const size_t<3>& dst_origin, const size_t<3>& region, - const VECTOR_CLASS* events = NULL, - Event* event = NULL) + const VECTOR_CLASS* events = nullptr, + Event* event = nullptr) { cl_int error; CommandQueue queue = CommandQueue::getDefault(&error); @@ -7063,7 +7724,7 @@ public: KernelFunctorGlobal( const Program& program, const STRING_CLASS name, - cl_int* err = NULL) : kernel_(program, name.c_str(), err) + cl_int* err = nullptr) : kernel_(program, name.c_str(), err) { } @@ -12287,15 +12948,15 @@ public: make_kernel( const Program& program, const STRING_CLASS name, - cl_int* err = NULL) : detail::functionImplementation_( - FunctorType(program, name, err)) + cl_int* err = nullptr) : detail::functionImplementation_( + FunctorType(program, name, err)) { } @@ -12404,10 +13065,9 @@ public: #undef __DEFAULT_BEING_INITIALIZED #undef __DEFAULT_INITIALIZED +#undef CL_HPP_RVALUE_REFERENCES_SUPPORTED +#undef CL_HPP_NOEXCEPT + } // namespace cl -#ifdef _WIN32 -#pragma pop_macro("max") -#endif // _WIN32 - #endif // CL_HPP_ diff --git a/src/algorithms/libs/opencl/clFFT.h b/src/algorithms/libs/opencl/clFFT.h index 9f9c8c1d3..348505312 100644 --- a/src/algorithms/libs/opencl/clFFT.h +++ b/src/algorithms/libs/opencl/clFFT.h @@ -57,6 +57,7 @@ extern "C" #include #ifdef __APPLE__ +#define CL_SILENCE_DEPRECATION #include #else #include diff --git a/src/algorithms/tracking/adapters/CMakeLists.txt b/src/algorithms/tracking/adapters/CMakeLists.txt index 7fbb840f3..f58e1c802 100644 --- a/src/algorithms/tracking/adapters/CMakeLists.txt +++ b/src/algorithms/tracking/adapters/CMakeLists.txt @@ -108,7 +108,7 @@ target_include_directories(tracking_adapters ${CMAKE_SOURCE_DIR}/src/core/interfaces ) -if(ENABLE_CUDA) +if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) target_link_libraries(tracking_adapters PUBLIC ${CUDA_LIBRARIES} diff --git a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt index 7f5c63bf6..77c9a01f5 100644 --- a/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt +++ b/src/algorithms/tracking/gnuradio_blocks/CMakeLists.txt @@ -97,7 +97,7 @@ target_link_libraries(tracking_gr_blocks tracking_libs ) -if(ENABLE_CUDA) +if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) target_link_libraries(tracking_gr_blocks PUBLIC ${CUDA_LIBRARIES} diff --git a/src/algorithms/tracking/libs/CMakeLists.txt b/src/algorithms/tracking/libs/CMakeLists.txt index e8bfb8d26..77178d036 100644 --- a/src/algorithms/tracking/libs/CMakeLists.txt +++ b/src/algorithms/tracking/libs/CMakeLists.txt @@ -17,18 +17,6 @@ # -if(ENABLE_CUDA) - # Append current NVCC flags by something, eg comput capability - # set(CUDA_NVCC_FLAGS ${CUDA_NVCC_FLAGS} --gpu-architecture sm_30) - list(APPEND CUDA_NVCC_FLAGS "-gencode arch=compute_30,code=sm_30; -std=c++11;-O3; -use_fast_math -default-stream per-thread") - set(CUDA_PROPAGATE_HOST_FLAGS OFF) - cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) - set(LIB_TYPE STATIC) #set the lib type - cuda_add_library(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu) - set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB) - set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS}) -endif() - set(TRACKING_LIB_SOURCES cpu_multicorrelator.cc cpu_multicorrelator_real_codes.cc @@ -63,6 +51,22 @@ set(TRACKING_LIB_HEADERS exponential_smoother.h ) + +if(ENABLE_CUDA) + if(CMAKE_VERSION VERSION_GREATER 3.11) + set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} cuda_multicorrelator.cu) + set(TRACKING_LIB_HEADERS ${TRACKING_LIB_HEADERS} cuda_multicorrelator.h) + else() + list(APPEND CUDA_NVCC_FLAGS "-gencode arch=compute_30,code=sm_30; -std=c++11;-O3; -use_fast_math -default-stream per-thread") + set(CUDA_PROPAGATE_HOST_FLAGS OFF) + cuda_include_directories(${CMAKE_CURRENT_SOURCE_DIR}) + set(LIB_TYPE STATIC) #set the lib type + cuda_add_library(CUDA_CORRELATOR_LIB ${LIB_TYPE} cuda_multicorrelator.h cuda_multicorrelator.cu) + set(OPT_TRACKING_LIBRARIES ${OPT_TRACKING_LIBRARIES} CUDA_CORRELATOR_LIB) + set(OPT_TRACKING_INCLUDES ${OPT_TRACKING_INCLUDES} ${CUDA_INCLUDE_DIRS}) + endif() +endif() + if(ARMADILLO_VERSION_STRING VERSION_GREATER 7.400) # sqrtmat_sympd() requires 7.400 set(TRACKING_LIB_SOURCES ${TRACKING_LIB_SOURCES} nonlinear_tracking.cc) @@ -95,10 +99,16 @@ target_link_libraries(tracking_libs Glog::glog ) -target_include_directories(tracking_libs - PUBLIC - ${OPT_TRACKING_INCLUDES} -) +if(NOT CMAKE_VERSION VERSION_GREATER 3.11) + target_link_libraries(tracking_libs + PUBLIC + ${OPT_TRACKING_LIBRARIES} + ) + target_include_directories(tracking_libs + PUBLIC + ${OPT_TRACKING_INCLUDES} + ) +endif() if(Boost_VERSION VERSION_GREATER "106599") target_compile_definitions(tracking_libs diff --git a/src/core/receiver/CMakeLists.txt b/src/core/receiver/CMakeLists.txt index 121b4ab75..83d684906 100644 --- a/src/core/receiver/CMakeLists.txt +++ b/src/core/receiver/CMakeLists.txt @@ -40,12 +40,6 @@ set(GNSS_RECEIVER_HEADERS control_message.h ) -if(ENABLE_CUDA) - set(OPT_RECEIVER_INCLUDE_DIRS - ${OPT_RECEIVER_INCLUDE_DIRS} ${CUDA_INCLUDE_DIRS} - ) -endif() - list(SORT GNSS_RECEIVER_HEADERS) list(SORT GNSS_RECEIVER_SOURCES) @@ -120,12 +114,16 @@ endif() if(OPENCL_FOUND) message(STATUS "Adding processing blocks implemented using OpenCL") + target_link_libraries(core_receiver PUBLIC algorithms_libs OpenCL::OpenCL) target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=1) else() target_compile_definitions(core_receiver PRIVATE -DOPENCL_BLOCKS=0) endif() if(ENABLE_CUDA) + if(NOT CMAKE_VERSION VERSION_GREATER 3.11) + target_include_directories(core_receiver PUBLIC ${CUDA_INCLUDE_DIRS}) + endif() target_compile_definitions(core_receiver PRIVATE -DCUDA_GPU_ACCEL=1) endif() @@ -212,5 +210,4 @@ endif() set_property(TARGET core_receiver APPEND PROPERTY INTERFACE_INCLUDE_DIRECTORIES $ $ - $ ) diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt index dac5a6eed..3ff4c9106 100644 --- a/src/main/CMakeLists.txt +++ b/src/main/CMakeLists.txt @@ -45,14 +45,16 @@ if(NOT ENABLE_LOG) endif() if(ENABLE_CUDA) - target_link_libraries(gnss-sdr - PUBLIC - ${CUDA_LIBRARIES} - ) - target_include_directories(gnss-sdr - PUBLIC - ${CUDA_INCLUDE_DIRS} - ) + if(NOT CMAKE_VERSION VERSION_GREATER 3.11) + target_link_libraries(gnss-sdr + PUBLIC + ${CUDA_LIBRARIES} + ) + target_include_directories(gnss-sdr + PUBLIC + ${CUDA_INCLUDE_DIRS} + ) + endif() target_compile_definitions(gnss-sdr PRIVATE -DCUDA_GPU_ACCEL=1) endif() diff --git a/src/tests/CMakeLists.txt b/src/tests/CMakeLists.txt index d69924200..e3bde0ee9 100644 --- a/src/tests/CMakeLists.txt +++ b/src/tests/CMakeLists.txt @@ -443,7 +443,7 @@ if(ENABLE_UNIT_TESTING) ) endif() endif() - if(ENABLE_CUDA) + if(ENABLE_CUDA AND NOT CMAKE_VERSION VERSION_GREATER 3.11) target_link_libraries(run_tests PUBLIC ${CUDA_LIBRARIES} diff --git a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc index b28e72aec..702b89f31 100644 --- a/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc +++ b/src/tests/unit-tests/signal-processing-blocks/acquisition/gps_l1_ca_pcps_opencl_acquisition_gsoc2013_test.cc @@ -494,50 +494,57 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResults) acquisition->init(); - ASSERT_NO_THROW({ - boost::shared_ptr signal_source; - SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue); - FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1); - signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue)); - signal_source->connect(top_block); - top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0); - top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); - }) << "Failure connecting the blocks of acquisition test."; - - // i = 0 --> satellite in acquisition is visible - // i = 1 --> satellite in acquisition is not visible - for (unsigned int i = 0; i < 2; i++) + if (!acquisition->opencl_ready()) { - init(); + std::cout << "OpenCL Platform is not ready." << std::endl; + } + else + { + ASSERT_NO_THROW({ + boost::shared_ptr signal_source; + SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue); + FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1); + signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue)); + signal_source->connect(top_block); + top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); + }) << "Failure connecting the blocks of acquisition test."; - if (i == 0) + // i = 0 --> satellite in acquisition is visible + // i = 1 --> satellite in acquisition is not visible + for (unsigned int i = 0; i < 2; i++) { - gnss_synchro.PRN = 10; // This satellite is visible - } - else if (i == 1) - { - gnss_synchro.PRN = 20; // This satellite is not visible - } + init(); - acquisition->set_local_code(); - - start_queue(); - - EXPECT_NO_THROW({ - top_block->run(); // Start threads and wait - }) << "Failure running the top_block."; - - if (i == 0) - { - EXPECT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; - if (message == 1) + if (i == 0) { - EXPECT_EQ(static_cast(1), correct_estimation_counter) << "Acquisition failure. Incorrect parameters estimation."; + gnss_synchro.PRN = 10; // This satellite is visible + } + else if (i == 1) + { + gnss_synchro.PRN = 20; // This satellite is not visible + } + + acquisition->set_local_code(); + + start_queue(); + + EXPECT_NO_THROW({ + top_block->run(); // Start threads and wait + }) << "Failure running the top_block."; + + if (i == 0) + { + EXPECT_EQ(1, message) << "Acquisition failure. Expected message: 1=ACQ SUCCESS."; + if (message == 1) + { + EXPECT_EQ(static_cast(1), correct_estimation_counter) << "Acquisition failure. Incorrect parameters estimation."; + } + } + else if (i == 1) + { + EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL."; } - } - else if (i == 1) - { - EXPECT_EQ(2, message) << "Acquisition failure. Expected message: 2=ACQ FAIL."; } } } @@ -575,52 +582,58 @@ TEST_F(GpsL1CaPcpsOpenClAcquisitionGSoC2013Test, ValidationOfResultsProbabilitie }) << "Failure connecting acquisition to the top_block."; acquisition->init(); - - ASSERT_NO_THROW({ - boost::shared_ptr signal_source; - SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue); - FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1); - signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue)); - signal_source->connect(top_block); - top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0); - top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); - }) << "Failure connecting the blocks of acquisition test."; - - std::cout << "Probability of false alarm (target) = " << 0.1 << std::endl; - - // i = 0 --> satellite in acquisition is visible (prob of detection and prob of detection with wrong estimation) - // i = 1 --> satellite in acquisition is not visible (prob of false detection) - for (unsigned int i = 0; i < 2; i++) + if (!acquisition->opencl_ready()) { - init(); + std::cout << "OpenCL Platform is not ready." << std::endl; + } + else + { + ASSERT_NO_THROW({ + boost::shared_ptr signal_source; + SignalGenerator* signal_generator = new SignalGenerator(config.get(), "SignalSource", 0, 1, queue); + FirFilter* filter = new FirFilter(config.get(), "InputFilter", 1, 1); + signal_source.reset(new GenSignalSource(signal_generator, filter, "SignalSource", queue)); + signal_source->connect(top_block); + top_block->connect(signal_source->get_right_block(), 0, acquisition->get_left_block(), 0); + top_block->msg_connect(acquisition->get_right_block(), pmt::mp("events"), msg_rx, pmt::mp("events")); + }) << "Failure connecting the blocks of acquisition test."; - if (i == 0) + std::cout << "Probability of false alarm (target) = " << 0.1 << std::endl; + + // i = 0 --> satellite in acquisition is visible (prob of detection and prob of detection with wrong estimation) + // i = 1 --> satellite in acquisition is not visible (prob of false detection) + for (unsigned int i = 0; i < 2; i++) { - gnss_synchro.PRN = 10; // This satellite is visible - } - else if (i == 1) - { - gnss_synchro.PRN = 20; // This satellite is not visible - } + init(); - acquisition->set_local_code(); + if (i == 0) + { + gnss_synchro.PRN = 10; // This satellite is visible + } + else if (i == 1) + { + gnss_synchro.PRN = 20; // This satellite is not visible + } - start_queue(); + acquisition->set_local_code(); - EXPECT_NO_THROW({ - top_block->run(); // Start threads and wait - }) << "Failure running the top_block."; + start_queue(); - if (i == 0) - { - std::cout << "Estimated probability of detection = " << Pd << std::endl; - std::cout << "Estimated probability of false alarm (satellite present) = " << Pfa_p << std::endl; - std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl; - } - else if (i == 1) - { - std::cout << "Estimated probability of false alarm (satellite absent) = " << Pfa_a << std::endl; - std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl; + EXPECT_NO_THROW({ + top_block->run(); // Start threads and wait + }) << "Failure running the top_block."; + + if (i == 0) + { + std::cout << "Estimated probability of detection = " << Pd << std::endl; + std::cout << "Estimated probability of false alarm (satellite present) = " << Pfa_p << std::endl; + std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl; + } + else if (i == 1) + { + std::cout << "Estimated probability of false alarm (satellite absent) = " << Pfa_a << std::endl; + std::cout << "Mean acq time = " << mean_acq_time_us << " microseconds." << std::endl; + } } } }