Skip to content

Commit ffa3f8e

Browse files
authored
Remove unused cl_khr_external_memory_dx and cl_khr_external_semaphore_dx_fence extensions (#1160)
No implementers (and no interest expressed), no CTS tests. These extensions should not be part of the specification. Change-Id: I064076c8075b5947ef9109558c4b03da426e4505 Signed-off-by: Kevin Petit <kevin.petit@arm.com>
1 parent b041b2f commit ffa3f8e

6 files changed

Lines changed: 5 additions & 206 deletions

api/cl_khr_external_memory_dx.asciidoc

Lines changed: 0 additions & 59 deletions
This file was deleted.

api/cl_khr_external_semaphore.asciidoc

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,7 @@ This extension defines:
6565
semaphores created from different handle types.
6666
* API query exportable semaphores handles using specified handle type.
6767

68-
The layered extensions {cl_khr_external_semaphore_dx_fence_EXT},
69-
{cl_khr_external_semaphore_opaque_fd_EXT},
68+
The layered extensions {cl_khr_external_semaphore_opaque_fd_EXT},
7069
{cl_khr_external_semaphore_sync_fd_EXT}, and
7170
{cl_khr_external_semaphore_win32_EXT} define specific external semaphores
7271
that may be imported into or exported from OpenCL.

api/cl_khr_external_semaphore_dx_fence.asciidoc

Lines changed: 0 additions & 45 deletions
This file was deleted.

api/opencl_runtime_layer.asciidoc

Lines changed: 2 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -5597,32 +5597,6 @@ The imported memory object holds a reference to its payload.
55975597

55985598
==== NT Handle Types
55995599

5600-
ifdef::cl_khr_external_memory_dx[]
5601-
The {cl_khr_external_memory_dx_EXT} extension extends
5602-
{cl_external_memory_handle_type_khr_TYPE} to support the following new types
5603-
of handles, and adds as a property that may be specified when creating a
5604-
buffer or an image memory object from an external handle:
5605-
5606-
* {CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KHR_anchor} specifies an NT handle
5607-
returned by `IDXGIResource1::CreateSharedHandle` referring to a Direct3D
5608-
10 or 11 texture resource.
5609-
It owns a reference to the memory used by the Direct3D resource.
5610-
* {CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KMT_KHR_anchor} specifies a global
5611-
share handle returned by `IDXGIResource::GetSharedHandle` referring to a
5612-
Direct3D 10 or 11 texture resource.
5613-
It does not own a reference to the underlying Direct3D resource, and
5614-
will therefore become invalid when all memory objects and Direct3D
5615-
resources associated with it are destroyed.
5616-
* {CL_EXTERNAL_MEMORY_HANDLE_D3D12_HEAP_KHR_anchor} specifies an NT handle
5617-
returned by `ID3D12Device::CreateSharedHandle` referring to a Direct3D
5618-
12 heap resource.
5619-
It owns a reference to the resources used by the Direct3D heap.
5620-
* {CL_EXTERNAL_MEMORY_HANDLE_D3D12_RESOURCE_KHR_anchor} specifies an NT handle
5621-
returned by `ID3D12Device::CreateSharedHandle` referring to a Direct3D
5622-
12 committed resource.
5623-
It owns a reference to the memory used by the Direct3D resource.
5624-
endif::cl_khr_external_memory_dx[]
5625-
56265600
ifdef::cl_khr_external_memory_win32[]
56275601
The {cl_khr_external_memory_win32_EXT} extension extends
56285602
{cl_external_memory_handle_type_khr_TYPE} to support the following new types
@@ -13128,42 +13102,10 @@ endif::cl_khr_external_semaphore_sync_fd[]
1312813102
endif::cl_khr_external_semaphore_opaque_fd,cl_khr_external_semaphore_sync_fd[]
1312913103

1313013104

13131-
ifdef::cl_khr_external_semaphore_dx_fence,cl_khr_external_semaphore_win32[]
13105+
ifdef::cl_khr_external_semaphore_win32[]
1313213106

1313313107
==== NT Handle Types
1313413108

13135-
ifdef::cl_khr_external_semaphore_dx_fence[]
13136-
13137-
The {cl_khr_external_semaphore_dx_fence_EXT} extension extends
13138-
{cl_external_semaphore_handle_type_khr_TYPE} to support the following new
13139-
types of handles, and adds as a property that may be specified when creating
13140-
a semaphore from an external handle:
13141-
13142-
* {CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR} specifies an NT handle returned by
13143-
`ID3D12Device::CreateSharedHandle` referring to a Direct3D 12 fence, or
13144-
`ID3D11Device5::CreateFence` referring to a Direct3D 11 fence.
13145-
It owns a reference to the underlying synchronization primitive
13146-
associated with the Direct3D fence.
13147-
13148-
When waiting on semaphores using {clEnqueueWaitSemaphoresKHR} or signaling
13149-
semaphores using {clEnqueueSignalSemaphoresKHR}, the semaphore payload must
13150-
be provided for semaphores created from
13151-
{CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR}.
13152-
13153-
* If _sema_objects_ list has a mix of semaphores obtained from
13154-
{CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR} and other handle types, then the
13155-
_sema_payload_list_ should point to a list of _num_sema_objects_ payload
13156-
values for each semaphore in _sema_objects_.
13157-
However, the payload values corresponding to semaphores with type
13158-
{CL_SEMAPHORE_TYPE_BINARY_KHR} can be set to 0 or will be ignored.
13159-
13160-
{clEnqueueWaitSemaphoresKHR} and {clEnqueueSignalSemaphoresKHR} may return
13161-
{CL_INVALID_VALUE} if _sema_objects_ list has one or more semaphores
13162-
obtained from {CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR} and _sema_payload_list_
13163-
is NULL.
13164-
13165-
endif::cl_khr_external_semaphore_dx_fence[]
13166-
1316713109
ifdef::cl_khr_external_semaphore_win32[]
1316813110

1316913111
The {cl_khr_external_semaphore_win32_EXT} extension extends
@@ -13193,14 +13135,6 @@ endif::cl_khr_external_semaphore_win32[]
1319313135
|====
1319413136
| Handle Type | Transference | Permanence
1319513137

13196-
ifdef::cl_khr_external_semaphore_dx_fence[]
13197-
| {CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR_anchor}
13198-
13199-
include::{generated}/api/version-notes/CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR.asciidoc[]
13200-
| Reference
13201-
| Temporary, Permanent
13202-
endif::cl_khr_external_semaphore_dx_fence[]
13203-
1320413138
ifdef::cl_khr_external_semaphore_win32[]
1320513139
| {CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_KHR_anchor}
1320613140

@@ -13223,7 +13157,7 @@ For handle types defined as NT handles, the application must release
1322313157
ownership using the `CloseHandle` system call when the handle is no longer
1322413158
needed.
1322513159

13226-
endif::cl_khr_external_semaphore_dx_fence,cl_khr_external_semaphore_win32[]
13160+
endif::cl_khr_external_semaphore_win32[]
1322713161

1322813162
endif::cl_khr_external_semaphore[]
1322913163

ext/quick_reference.asciidoc

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,6 @@ Language Specifications.
104104
| dma_buf External Memory Handles
105105
| Extension
106106

107-
| [[cl_khr_external_memory_dx]] link:{APISpecURL}#cl_khr_external_memory[{cl_khr_external_memory_dx_EXT}]
108-
| Direct3D 11 and 12 External Memory Handles
109-
| Provisional Extension
110-
111107
| [[cl_khr_external_memory_opaque_fd]] link:{APISpecURL}#cl_khr_external_memory[{cl_khr_external_memory_opaque_fd_EXT}]
112108
| Opaque File Descriptor External Memory Handles
113109
| Extension
@@ -124,10 +120,6 @@ Language Specifications.
124120
| Common Functionality for External Semaphore Sharing
125121
| Extension
126122

127-
| [[cl_khr_external_semaphore_dx_fence]] link:{APISpecURL}#cl_khr_external_semaphore[{cl_khr_external_semaphore_dx_fence_EXT}]
128-
| Direct3D 12 External Semaphore Handles
129-
| Provisional Extension
130-
131123
| [[cl_khr_external_semaphore_opaque_fd]] link:{APISpecURL}#cl_khr_external_semaphore[{cl_khr_external_semaphore_opaque_fd_EXT}]
132124
| Opaque File Descriptor External Semaphore Handles
133125
| Extension

xml/cl.xml

Lines changed: 2 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,14 +1888,11 @@ server's OpenCL/api-docs repository.
18881888
<enum value="0x2056" name="CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_KHR"/>
18891889
<enum value="0x2057" name="CL_SEMAPHORE_HANDLE_OPAQUE_WIN32_KMT_KHR"/>
18901890
<enum value="0x2058" name="CL_SEMAPHORE_HANDLE_SYNC_FD_KHR"/>
1891-
<enum value="0x2059" name="CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR"/>
1891+
<unused start="0x2059" end="0x2059" comment="Reserved to Khronos for interop"/>
18921892
<enum value="0x2060" name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_FD_KHR"/>
18931893
<enum value="0x2061" name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KHR"/>
18941894
<enum value="0x2062" name="CL_EXTERNAL_MEMORY_HANDLE_OPAQUE_WIN32_KMT_KHR"/>
1895-
<enum value="0x2063" name="CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KHR"/>
1896-
<enum value="0x2064" name="CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KMT_KHR"/>
1897-
<enum value="0x2065" name="CL_EXTERNAL_MEMORY_HANDLE_D3D12_HEAP_KHR"/>
1898-
<enum value="0x2066" name="CL_EXTERNAL_MEMORY_HANDLE_D3D12_RESOURCE_KHR"/>
1895+
<unused start="0x2063" end="0x2066" comment="Reserved to Khronos for interop"/>
18991896
<enum value="0x2067" name="CL_EXTERNAL_MEMORY_HANDLE_DMA_BUF_KHR"/>
19001897
<unused start="0x2068" end="0x2FFF" comment="Reserved to Khronos for interop"/>
19011898
</enums>
@@ -7057,14 +7054,6 @@ server's OpenCL/api-docs repository.
70577054
<command name="clGetSemaphoreHandleForTypeKHR"/>
70587055
</require>
70597056
</extension>
7060-
<extension name="cl_khr_external_semaphore_dx_fence" revision="0.9.0" supported="opencl" depends="CL_VERSION_1_2+cl_khr_semaphore+cl_khr_external_semaphore" ratified="opencl" provisional="true">
7061-
<require>
7062-
<type name="CL/cl.h"/>
7063-
</require>
7064-
<require comment="cl_external_semaphore_handle_type_khr">
7065-
<enum name="CL_SEMAPHORE_HANDLE_D3D12_FENCE_KHR"/>
7066-
</require>
7067-
</extension>
70687057
<extension name="cl_khr_external_semaphore_opaque_fd" revision="0.9.0" supported="opencl" depends="CL_VERSION_1_2+cl_khr_semaphore+cl_khr_external_semaphore" ratified="opencl">
70697058
<require>
70707059
<type name="CL/cl.h"/>
@@ -7131,17 +7120,6 @@ server's OpenCL/api-docs repository.
71317120
<enum name="CL_EXTERNAL_MEMORY_HANDLE_DMA_BUF_KHR"/>
71327121
</require>
71337122
</extension>
7134-
<extension name="cl_khr_external_memory_dx" revision="0.9.3" supported="opencl" depends="CL_VERSION_3_0+cl_khr_external_memory" ratified="opencl" provisional="true">
7135-
<require>
7136-
<type name="CL/cl.h"/>
7137-
</require>
7138-
<require comment="cl_external_memory_handle_type_khr">
7139-
<enum name="CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KHR"/>
7140-
<enum name="CL_EXTERNAL_MEMORY_HANDLE_D3D11_TEXTURE_KMT_KHR"/>
7141-
<enum name="CL_EXTERNAL_MEMORY_HANDLE_D3D12_HEAP_KHR"/>
7142-
<enum name="CL_EXTERNAL_MEMORY_HANDLE_D3D12_RESOURCE_KHR"/>
7143-
</require>
7144-
</extension>
71457123
<extension name="cl_khr_external_memory_opaque_fd" revision="0.9.3" supported="opencl" depends="CL_VERSION_3_0+cl_khr_external_memory" ratified="opencl">
71467124
<require>
71477125
<type name="CL/cl.h"/>

0 commit comments

Comments
 (0)