mirror of
https://bitbucket.org/mfeemster/fractorium.git
synced 2025-01-23 06:00:07 -05:00
1dfbd4eff2
-Add new preset dimensions to the right click menu of the width and height fields in the editor. -Change QSS stylesheets to properly handle tabs. -Make tabs rectangular by default. For some reason, they had always been triangular. --Bug fixes -Incremental rendering times in the editor were wrong. --Code changes -Migrate to Qt6. There is probably more work to be done here. -Migrate to VS2022. -Migrate to Wix 4 installer. -Change installer to install to program files for all users. -Fix many VS2022 code analysis warnings. -No longer use byte typedef, because std::byte is now a type. Revert all back to unsigned char. -Upgrade OpenCL headers to version 3.0 and keep locally now rather than trying to look for system files. -No longer link to Nvidia or AMD specific OpenCL libraries. Use the generic installer located at OCL_ROOT too. -Add the ability to change OpenCL grid dimensions. This was attempted for investigating possible performance improvments, but made no difference. This has not been verified on Linux or Mac yet.
82 lines
3.1 KiB
C
82 lines
3.1 KiB
C
/*******************************************************************************
|
|
* Copyright (c) 2018-2020 The Khronos Group Inc.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
******************************************************************************/
|
|
|
|
#ifndef __CL_VERSION_H
|
|
#define __CL_VERSION_H
|
|
|
|
/* Detect which version to target */
|
|
#if !defined(CL_TARGET_OPENCL_VERSION)
|
|
#pragma message("cl_version.h: CL_TARGET_OPENCL_VERSION is not defined. Defaulting to 300 (OpenCL 3.0)")
|
|
#define CL_TARGET_OPENCL_VERSION 300
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION != 100 && \
|
|
CL_TARGET_OPENCL_VERSION != 110 && \
|
|
CL_TARGET_OPENCL_VERSION != 120 && \
|
|
CL_TARGET_OPENCL_VERSION != 200 && \
|
|
CL_TARGET_OPENCL_VERSION != 210 && \
|
|
CL_TARGET_OPENCL_VERSION != 220 && \
|
|
CL_TARGET_OPENCL_VERSION != 300
|
|
#pragma message("cl_version: CL_TARGET_OPENCL_VERSION is not a valid value (100, 110, 120, 200, 210, 220, 300). Defaulting to 300 (OpenCL 3.0)")
|
|
#undef CL_TARGET_OPENCL_VERSION
|
|
#define CL_TARGET_OPENCL_VERSION 300
|
|
#endif
|
|
|
|
|
|
/* OpenCL Version */
|
|
#if CL_TARGET_OPENCL_VERSION >= 300 && !defined(CL_VERSION_3_0)
|
|
#define CL_VERSION_3_0 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 220 && !defined(CL_VERSION_2_2)
|
|
#define CL_VERSION_2_2 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 210 && !defined(CL_VERSION_2_1)
|
|
#define CL_VERSION_2_1 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 200 && !defined(CL_VERSION_2_0)
|
|
#define CL_VERSION_2_0 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 120 && !defined(CL_VERSION_1_2)
|
|
#define CL_VERSION_1_2 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 110 && !defined(CL_VERSION_1_1)
|
|
#define CL_VERSION_1_1 1
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION >= 100 && !defined(CL_VERSION_1_0)
|
|
#define CL_VERSION_1_0 1
|
|
#endif
|
|
|
|
/* Allow deprecated APIs for older OpenCL versions. */
|
|
#if CL_TARGET_OPENCL_VERSION <= 220 && !defined(CL_USE_DEPRECATED_OPENCL_2_2_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_2_2_APIS
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION <= 210 && !defined(CL_USE_DEPRECATED_OPENCL_2_1_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_2_1_APIS
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION <= 200 && !defined(CL_USE_DEPRECATED_OPENCL_2_0_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_2_0_APIS
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION <= 120 && !defined(CL_USE_DEPRECATED_OPENCL_1_2_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_1_2_APIS
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION <= 110 && !defined(CL_USE_DEPRECATED_OPENCL_1_1_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_1_1_APIS
|
|
#endif
|
|
#if CL_TARGET_OPENCL_VERSION <= 100 && !defined(CL_USE_DEPRECATED_OPENCL_1_0_APIS)
|
|
#define CL_USE_DEPRECATED_OPENCL_1_0_APIS
|
|
#endif
|
|
|
|
#endif /* __CL_VERSION_H */
|