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.
373 lines
11 KiB
C
373 lines
11 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_GL_H_
|
|
#define OPENCL_CL_GL_H_
|
|
|
|
/*
|
|
** This header is generated from the Khronos OpenCL XML API Registry.
|
|
*/
|
|
|
|
#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_gl_sharing
|
|
***************************************************************/
|
|
#define cl_khr_gl_sharing 1
|
|
#define CL_KHR_GL_SHARING_EXTENSION_NAME \
|
|
"cl_khr_gl_sharing"
|
|
|
|
typedef cl_uint cl_gl_context_info;
|
|
|
|
/* Error codes */
|
|
#define CL_INVALID_GL_SHAREGROUP_REFERENCE_KHR -1000
|
|
|
|
/* cl_gl_context_info */
|
|
#define CL_CURRENT_DEVICE_FOR_GL_CONTEXT_KHR 0x2006
|
|
#define CL_DEVICES_FOR_GL_CONTEXT_KHR 0x2007
|
|
|
|
/* Additional cl_context_properties */
|
|
#define CL_GL_CONTEXT_KHR 0x2008
|
|
#define CL_EGL_DISPLAY_KHR 0x2009
|
|
#define CL_GLX_DISPLAY_KHR 0x200A
|
|
#define CL_WGL_HDC_KHR 0x200B
|
|
#define CL_CGL_SHAREGROUP_KHR 0x200C
|
|
|
|
typedef cl_uint cl_gl_object_type;
|
|
typedef cl_uint cl_gl_texture_info;
|
|
typedef cl_uint cl_gl_platform_info;
|
|
|
|
/* cl_gl_object_type */
|
|
#define CL_GL_OBJECT_BUFFER 0x2000
|
|
#define CL_GL_OBJECT_TEXTURE2D 0x2001
|
|
#define CL_GL_OBJECT_TEXTURE3D 0x2002
|
|
#define CL_GL_OBJECT_RENDERBUFFER 0x2003
|
|
|
|
#if defined(CL_VERSION_1_2)
|
|
/* cl_gl_object_type */
|
|
#define CL_GL_OBJECT_TEXTURE2D_ARRAY 0x200E
|
|
#define CL_GL_OBJECT_TEXTURE1D 0x200F
|
|
#define CL_GL_OBJECT_TEXTURE1D_ARRAY 0x2010
|
|
#define CL_GL_OBJECT_TEXTURE_BUFFER 0x2011
|
|
|
|
#endif /* defined(CL_VERSION_1_2) */
|
|
|
|
/* cl_gl_texture_info */
|
|
#define CL_GL_TEXTURE_TARGET 0x2004
|
|
#define CL_GL_MIPMAP_LEVEL 0x2005
|
|
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetGLContextInfoKHR_fn)(
|
|
const cl_context_properties* properties,
|
|
cl_gl_context_info param_name,
|
|
size_t param_value_size,
|
|
void* param_value,
|
|
size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromGLBuffer_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLuint bufobj,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
#if !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetGLContextInfoKHR(
|
|
const cl_context_properties* properties,
|
|
cl_gl_context_info param_name,
|
|
size_t param_value_size,
|
|
void* param_value,
|
|
size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromGLBuffer(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLuint bufobj,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
#if defined(CL_VERSION_1_2)
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromGLTexture_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
|
|
|
#if !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromGLTexture(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_2;
|
|
|
|
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
#endif /* defined(CL_VERSION_1_2) */
|
|
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromGLRenderbuffer_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLuint renderbuffer,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetGLObjectInfo_fn)(
|
|
cl_mem memobj,
|
|
cl_gl_object_type* gl_object_type,
|
|
cl_GLuint* gl_object_name) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetGLTextureInfo_fn)(
|
|
cl_mem memobj,
|
|
cl_gl_texture_info param_name,
|
|
size_t param_value_size,
|
|
void* param_value,
|
|
size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clEnqueueAcquireGLObjects_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 *
|
|
clEnqueueReleaseGLObjects_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_mem CL_API_CALL
|
|
clCreateFromGLRenderbuffer(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLuint renderbuffer,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetGLObjectInfo(
|
|
cl_mem memobj,
|
|
cl_gl_object_type* gl_object_type,
|
|
cl_GLuint* gl_object_name) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetGLTextureInfo(
|
|
cl_mem memobj,
|
|
cl_gl_texture_info param_name,
|
|
size_t param_value_size,
|
|
void* param_value,
|
|
size_t* param_value_size_ret) CL_API_SUFFIX__VERSION_1_0;
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clEnqueueAcquireGLObjects(
|
|
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
|
|
clEnqueueReleaseGLObjects(
|
|
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) */
|
|
|
|
/* OpenCL 1.0 APIs that were deprecated in OpenCL 1.2 */
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromGLTexture2D_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
|
|
|
|
typedef cl_mem (CL_API_CALL *
|
|
clCreateFromGLTexture3D_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
|
|
|
|
#if !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromGLTexture2D(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
|
|
|
|
extern CL_API_ENTRY cl_mem CL_API_CALL
|
|
clCreateFromGLTexture3D(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_GLenum target,
|
|
cl_GLint miplevel,
|
|
cl_GLuint texture,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1_DEPRECATED;
|
|
|
|
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
/***************************************************************
|
|
* cl_khr_gl_event
|
|
***************************************************************/
|
|
#define cl_khr_gl_event 1
|
|
#define CL_KHR_GL_EVENT_EXTENSION_NAME \
|
|
"cl_khr_gl_event"
|
|
|
|
typedef struct __GLsync * cl_GLsync;
|
|
|
|
/* cl_command_type */
|
|
#define CL_COMMAND_GL_FENCE_SYNC_OBJECT_KHR 0x200D
|
|
|
|
|
|
typedef cl_event (CL_API_CALL *
|
|
clCreateEventFromGLsyncKHR_fn)(
|
|
cl_context context,
|
|
cl_GLsync sync,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1;
|
|
|
|
#if !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_event CL_API_CALL
|
|
clCreateEventFromGLsyncKHR(
|
|
cl_context context,
|
|
cl_GLsync sync,
|
|
cl_int* errcode_ret) CL_API_SUFFIX__VERSION_1_1;
|
|
|
|
#endif /* !defined(CL_NO_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
/***************************************************************
|
|
* cl_khr_gl_depth_images
|
|
***************************************************************/
|
|
#define cl_khr_gl_depth_images 1
|
|
#define CL_KHR_GL_DEPTH_IMAGES_EXTENSION_NAME \
|
|
"cl_khr_gl_depth_images"
|
|
|
|
#if !defined(CL_VERSION_1_2)
|
|
/* cl_channel_order - defined in CL.h for OpenCL 1.2 and newer */
|
|
#define CL_DEPTH_STENCIL 0x10BE
|
|
|
|
#endif /* !defined(CL_VERSION_1_2) */
|
|
|
|
#if !defined(CL_VERSION_1_2)
|
|
/* cl_channel_type - defined in CL.h for OpenCL 1.2 and newer */
|
|
#define CL_UNORM_INT24 0x10DF
|
|
|
|
#endif /* !defined(CL_VERSION_1_2) */
|
|
|
|
/***************************************************************
|
|
* cl_khr_gl_msaa_sharing
|
|
***************************************************************/
|
|
#define cl_khr_gl_msaa_sharing 1
|
|
#define CL_KHR_GL_MSAA_SHARING_EXTENSION_NAME \
|
|
"cl_khr_gl_msaa_sharing"
|
|
|
|
/* cl_gl_texture_info */
|
|
#define CL_GL_NUM_SAMPLES 0x2012
|
|
|
|
/***************************************************************
|
|
* cl_intel_sharing_format_query_gl
|
|
***************************************************************/
|
|
#define cl_intel_sharing_format_query_gl 1
|
|
#define CL_INTEL_SHARING_FORMAT_QUERY_GL_EXTENSION_NAME \
|
|
"cl_intel_sharing_format_query_gl"
|
|
|
|
/* when cl_khr_gl_sharing is supported */
|
|
|
|
typedef cl_int (CL_API_CALL *
|
|
clGetSupportedGLTextureFormatsINTEL_fn)(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_mem_object_type image_type,
|
|
cl_uint num_entries,
|
|
cl_GLenum* gl_formats,
|
|
cl_uint* num_texture_formats) ;
|
|
|
|
#if !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES)
|
|
|
|
extern CL_API_ENTRY cl_int CL_API_CALL
|
|
clGetSupportedGLTextureFormatsINTEL(
|
|
cl_context context,
|
|
cl_mem_flags flags,
|
|
cl_mem_object_type image_type,
|
|
cl_uint num_entries,
|
|
cl_GLenum* gl_formats,
|
|
cl_uint* num_texture_formats) ;
|
|
|
|
#endif /* !defined(CL_NO_NON_ICD_DISPATCH_EXTENSION_PROTOTYPES) */
|
|
|
|
#ifdef __cplusplus
|
|
}
|
|
#endif
|
|
|
|
#endif /* OPENCL_CL_GL_H_ */
|