mirror of
https://github.com/KhronosGroup/OpenCL-CTS.git
synced 2026-03-19 06:09:01 +00:00
* Vulkan: Fix descriptor sets Use descriptor set arrays when programming arrays for compute shader. Change-Id: Idabab775a256a223660eb7a850e26f290453659e * Vulkan: Fix queue propertyies Transfer bit for queue family is not required to be reported by the implementation, it is implicit for compute. Change-Id: I7424b00e25e35145433dd74b0b4dfe7eeeaf98c8 * Vulkan: Allow implementation to choose dedicated memory Dedicated vs non-dedicated memory must be queried by the app. Implementations are not required to support exportable non-dedicated memory. Change-Id: Idbc46ace1be20f61d1b58b34756f6d79a7745911 * Fix formatting Auto-generated formatting fix * Fix bug in dedicated memory. * Add check for if OpenCL assumes linear tiling Change-Id: Idd2e24d9d69e1fbc3ccb4a279067533104185332 * Changed macro name to reflect spec CL_DEVICE_EXTERNAL_MEMORY_IMPORT_ASSUME_LINEAR_HANDLE_TYPES_KHR to CL_DEVICE_EXTERNAL_MEMORY_IMPORT_ASSUME_LINEAR_IMAGES_HANDLE_TYPES_KHR Also changed some functions to not use the KHR variants. --------- Co-authored-by: Joshua Kelly <joshkell@qti.qualcomm.com>
137 lines
5.0 KiB
C++
137 lines
5.0 KiB
C++
//
|
|
// Copyright (c) 2022 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_vulkan_wrapper_hpp_
|
|
#define _opencl_vulkan_wrapper_hpp_
|
|
|
|
#include "vulkan_wrapper.hpp"
|
|
|
|
#if !defined(__APPLE__)
|
|
#include <CL/cl.h>
|
|
#include <CL/cl_ext.h>
|
|
#else
|
|
#include <OpenCL/cl.h>
|
|
#include <OpenCL/cl_ext.h>
|
|
#endif
|
|
|
|
typedef cl_semaphore_khr (*pfnclCreateSemaphoreWithPropertiesKHR)(
|
|
cl_context context, cl_semaphore_properties_khr *sema_props,
|
|
cl_int *errcode_ret);
|
|
typedef cl_int (*pfnclEnqueueWaitSemaphoresKHR)(
|
|
cl_command_queue command_queue, cl_uint num_semaphores,
|
|
const cl_semaphore_khr *sema_list,
|
|
const cl_semaphore_payload_khr *sema_payload_list,
|
|
cl_uint num_events_in_wait_list, const cl_event *event_wait_list,
|
|
cl_event *event);
|
|
typedef cl_int (*pfnclEnqueueSignalSemaphoresKHR)(
|
|
cl_command_queue command_queue, cl_uint num_semaphores,
|
|
const cl_semaphore_khr *sema_list,
|
|
const cl_semaphore_payload_khr *sema_payload_list,
|
|
cl_uint num_events_in_wait_list, const cl_event *event_wait_list,
|
|
cl_event *event);
|
|
typedef cl_int (*pfnclEnqueueAcquireExternalMemObjectsKHR)(
|
|
cl_command_queue command_queue, cl_uint num_mem_objects,
|
|
const cl_mem *mem_objects, cl_uint num_events_in_wait_list,
|
|
const cl_event *event_wait_list, cl_event *event);
|
|
typedef cl_int (*pfnclEnqueueReleaseExternalMemObjectsKHR)(
|
|
cl_command_queue command_queue, cl_uint num_mem_objects,
|
|
const cl_mem *mem_objects, cl_uint num_events_in_wait_list,
|
|
const cl_event *event_wait_list, cl_event *event);
|
|
typedef cl_int (*pfnclReleaseSemaphoreKHR)(cl_semaphore_khr sema_object);
|
|
|
|
extern pfnclCreateSemaphoreWithPropertiesKHR
|
|
clCreateSemaphoreWithPropertiesKHRptr;
|
|
extern pfnclEnqueueWaitSemaphoresKHR clEnqueueWaitSemaphoresKHRptr;
|
|
extern pfnclEnqueueSignalSemaphoresKHR clEnqueueSignalSemaphoresKHRptr;
|
|
extern pfnclEnqueueAcquireExternalMemObjectsKHR
|
|
clEnqueueAcquireExternalMemObjectsKHRptr;
|
|
extern pfnclEnqueueReleaseExternalMemObjectsKHR
|
|
clEnqueueReleaseExternalMemObjectsKHRptr;
|
|
extern pfnclReleaseSemaphoreKHR clReleaseSemaphoreKHRptr;
|
|
|
|
cl_int getCLImageInfoFromVkImageInfo(const VkImageCreateInfo *, size_t,
|
|
cl_image_format *, cl_image_desc *);
|
|
cl_int check_external_memory_handle_type(
|
|
cl_device_id deviceID,
|
|
cl_external_memory_handle_type_khr requiredHandleType);
|
|
cl_int check_external_semaphore_handle_type(
|
|
cl_device_id deviceID,
|
|
cl_external_semaphore_handle_type_khr requiredHandleType);
|
|
cl_int setMaxImageDimensions(cl_device_id deviceID, size_t &width,
|
|
size_t &height);
|
|
|
|
class clExternalMemory {
|
|
protected:
|
|
cl_mem m_externalMemory;
|
|
int fd;
|
|
void *handle;
|
|
clExternalMemory(const clExternalMemory &externalMemory);
|
|
|
|
public:
|
|
clExternalMemory();
|
|
clExternalMemory(const VulkanDeviceMemory *deviceMemory,
|
|
VulkanExternalMemoryHandleType externalMemoryHandleType,
|
|
uint64_t offset, uint64_t size, cl_context context,
|
|
cl_device_id deviceId);
|
|
|
|
virtual ~clExternalMemory();
|
|
cl_mem getExternalMemoryBuffer();
|
|
};
|
|
class clExternalMemoryImage {
|
|
protected:
|
|
cl_mem m_externalMemory;
|
|
int fd;
|
|
void *handle;
|
|
cl_command_queue cmd_queue;
|
|
clExternalMemoryImage();
|
|
|
|
public:
|
|
clExternalMemoryImage(
|
|
const VulkanDeviceMemory &deviceMemory,
|
|
VulkanExternalMemoryHandleType externalMemoryHandleType,
|
|
cl_context context, size_t totalImageMemSize, size_t imageWidth,
|
|
size_t imageHeight, size_t totalSize, const VulkanImage2D &image2D,
|
|
cl_device_id deviceId);
|
|
virtual ~clExternalMemoryImage();
|
|
cl_mem getExternalMemoryImage();
|
|
};
|
|
|
|
class clExternalSemaphore {
|
|
protected:
|
|
cl_semaphore_khr m_externalSemaphore;
|
|
int fd;
|
|
void *handle;
|
|
clExternalSemaphore(const clExternalSemaphore &externalSemaphore);
|
|
|
|
public:
|
|
clExternalSemaphore(
|
|
const VulkanSemaphore &deviceSemaphore, cl_context context,
|
|
VulkanExternalSemaphoreHandleType externalSemaphoreHandleType,
|
|
cl_device_id deviceId);
|
|
virtual ~clExternalSemaphore() noexcept(false);
|
|
void signal(cl_command_queue command_queue);
|
|
void wait(cl_command_queue command_queue);
|
|
cl_semaphore_khr &getCLSemaphore();
|
|
// operator openclExternalSemaphore_t() const;
|
|
};
|
|
|
|
extern void init_cl_vk_ext(cl_platform_id);
|
|
|
|
VulkanImageTiling vkClExternalMemoryHandleTilingAssumption(
|
|
cl_device_id deviceId,
|
|
VulkanExternalMemoryHandleType vkExternalMemoryHandleType, int *error_ret);
|
|
|
|
#endif // _opencl_vulkan_wrapper_hpp_
|