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.
242 lines
7.4 KiB
C
242 lines
7.4 KiB
C
/*******************************************************************************
|
|
* Copyright (c) 2008-2023 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 OPENCL_CL_D3D10_H_
|
|
#define OPENCL_CL_D3D10_H_
|
|
|
|
/*
|
|
** This header is generated from the Khronos OpenCL XML API Registry.
|
|
*/
|
|
|
|
#if defined(_MSC_VER)
|
|
#if _MSC_VER >=1500
|
|
#pragma warning( push )
|
|
#pragma warning( disable : 4201 )
|
|
#pragma warning( disable : 5105 )
|
|
#endif
|
|
#endif
|
|
#include <d3d10.h>
|
|
#if defined(_MSC_VER)
|
|
#if _MSC_VER >=1500
|
|
#pragma warning( pop )
|
|
#endif
|
|
#endif
|
|
|
|
#include <CL/cl.h>
|
|
|
|
/* CL_NO_PROTOTYPES implies CL_NO_EXTENSION_PROTOTYPES: */
|
|
#if defined(CL_NO_PROTOTYPES) && !defined(CL_NO_EXTENSION_PROTOTYPES)
|
|
#define CL_NO_EXTENSION_PROTOTYPES
|
|
#endif
|
|
|
|
/* CL_NO_EXTENSION_PROTOTYPES implies
|
|
CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES and
|
|
CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES: */
|
|
#if defined(CL_NO_EXTENSION_PROTOTYPES) && \
|
|
!defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
#define CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES
|
|
#endif
|
|
#if defined(CL_NO_EXTENSION_PROTOTYPES) && \
|
|
!defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
#define CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
/***************************************************************
|
|
* cl_khr_d3d10_sharing
|
|
***************************************************************/
|
|
#define cl_khr_d3d10_sharing 1
|
|
#define CL_KHR_D3D10_SHARING_EXTENSION_NAME \
|
|
"cl_khr_d3d10_sharing"
|
|
|
|
typedef cl_uint cl_d3d10_device_source_khr;
|
|
typedef cl_uint cl_d3d10_device_set_khr;
|
|
|
|
/* Error codes */
|
|
#define CL_INVALID_D3D10_DEVICE_KHR -1002
|
|
#define CL_INVALID_D3D10_RESOURCE_KHR -1003
|
|
#define CL_D3D10_RESOURCE_ALREADY_ACQUIRED_KHR -1004
|
|
#define CL_D3D10_RESOURCE_NOT_ACQUIRED_KHR -1005
|
|
|
|
/* cl_d3d10_device_source_khr */
|
|
#define CL_D3D10_DEVICE_KHR 0x4010
|
|
#define CL_D3D10_DXGI_ADAPTER_KHR 0x4011
|
|
|
|
/* cl_d3d10_device_set_khr */
|
|
#define CL_PREFERRED_DEVICES_FOR_D3D10_KHR 0x4012
|
|
#define CL_ALL_DEVICES_FOR_D3D10_KHR 0x4013
|
|
|
|
/* cl_context_info */
|
|
#define CL_CONTEXT_D3D10_DEVICE_KHR 0x4014
|
|
#define CL_CONTEXT_D3D10_PREFER_SHARED_RESOURCES_KHR 0x402C
|
|
|
|
/* cl_mem_info */
|
|
#define CL_MEM_D3D10_RESOURCE_KHR 0x4015
|
|
|
|
/* cl_image_info */
|
|
#define CL_IMAGE_D3D10_SUBRESOURCE_KHR 0x4016
|
|
|
|
/* cl_command_type */
|
|
#define CL_COMMAND_ACQUIRE_D3D10_OBJECTS_KHR 0x4017
|
|
#define CL_COMMAND_RELEASE_D3D10_OBJECTS_KHR 0x4018
|
|
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetDeviceIDsFromD3D10KHR_fn)(
|
|
cl_platform_id platform,
|
|
cl_d3d10_device_source_khr d3d_device_source,
|
|
void* d3d_object,
|
|
cl_d3d10_device_set_khr d3d_device_set,
|
|
cl_uint num_entries,
|
|
cl_device_id* devices,
|
|
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromD3D10BufferKHR_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Buffer* resource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromD3D10Texture2DKHR_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Texture2D* resource,
|
|
UINT subresource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromD3D10Texture3DKHR_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Texture3D* resource,
|
|
UINT subresource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clEnqueueAcquireD3D10ObjectsKHR_fn)(
|
|
cl_command_queue command_queue,
|
|
cl_uint num_objects,
|
|
const cl_mem* mem_objects,
|
|
cl_uint num_events_in_wait_list,
|
|
const cl_event* event_wait_list,
|
|
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clEnqueueReleaseD3D10ObjectsKHR_fn)(
|
|
cl_command_queue command_queue,
|
|
cl_uint num_objects,
|
|
const cl_mem* mem_objects,
|
|
cl_uint num_events_in_wait_list,
|
|
const cl_event* event_wait_list,
|
|
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
#if !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetDeviceIDsFromD3D10KHR(
|
|
cl_platform_id platform,
|
|
cl_d3d10_device_source_khr d3d_device_source,
|
|
void* d3d_object,
|
|
cl_d3d10_device_set_khr d3d_device_set,
|
|
cl_uint num_entries,
|
|
cl_device_id* devices,
|
|
cl_uint* num_devices) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromD3D10BufferKHR(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Buffer* resource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromD3D10Texture2DKHR(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Texture2D* resource,
|
|
UINT subresource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromD3D10Texture3DKHR(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
ID3D10Texture3D* resource,
|
|
UINT subresource,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clEnqueueAcquireD3D10ObjectsKHR(
|
|
cl_command_queue command_queue,
|
|
cl_uint num_objects,
|
|
const cl_mem* mem_objects,
|
|
cl_uint num_events_in_wait_list,
|
|
const cl_event* event_wait_list,
|
|
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clEnqueueReleaseD3D10ObjectsKHR(
|
|
cl_command_queue command_queue,
|
|
cl_uint num_objects,
|
|
const cl_mem* mem_objects,
|
|
cl_uint num_events_in_wait_list,
|
|
const cl_event* event_wait_list,
|
|
cl_event* event) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
/***************************************************************
|
|
* cl_intel_sharing_format_query_d3d10
|
|
***************************************************************/
|
|
#define cl_intel_sharing_format_query_d3d10 1
|
|
#define CL_INTEL_SHARING_FORMAT_QUERY_D3D10_EXTENSION_NAME \
|
|
"cl_intel_sharing_format_query_d3d10"
|
|
|
|
/* when cl_khr_d3d10_sharing is supported */
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetSupportedD3D10TextureFormatsINTEL_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_mem_object_type image_type,
|
|
cl_uint num_entries,
|
|
DXGI_FORMAT* d3d10_formats,
|
|
cl_uint* num_texture_formats) ;
|
|
|
|
#if !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetSupportedD3D10TextureFormatsINTEL(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_mem_object_type image_type,
|
|
cl_uint num_entries,
|
|
DXGI_FORMAT* d3d10_formats,
|
|
cl_uint* num_texture_formats) ;
|
|
|
|
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* OPENCL_CL_D3D10_H_ */
|