Merge branch 'main' into cl_khr_unified_svm

Author: bashbaug

.github/workflows/presubmit.yml

@@ -20,7 +20,7 @@ jobs:
     container: khronosgroup/docker-images@sha256:4aab96a03ef292439c9bd0f972adfa29cdf838d0909b1cb4ec2a6d7b2d14a37f
 
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: recursive
           # If fetch-depth: 0 is not specified, then
@@ -45,7 +45,7 @@ jobs:
 
       - name: Generate core specs (HTML and PDF)
         run: |
-          python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 -O api c env ext cxx4opencl
+          python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 -O api c env cxx4opencl
 
       - name: Generate core + KHR extension specs (HTML)
         run: |

.github/workflows/release.yml

@@ -22,7 +22,7 @@ jobs:
 
     steps:
       - name: Get Spec Source
-        uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           submodules: recursive
           # If fetch-depth: 0 is not specified, then
@@ -43,10 +43,10 @@ jobs:
 
       - name: Build Specs
         run: |
-            python3 makeSpec -clean -spec khr+ext OUTDIR=out.release -j 5 api c env ext cxx4opencl
+            python3 makeSpec -clean -spec khr+ext OUTDIR=out.release -j 5 api c env cxx4opencl
 
       - name: Release Specs
-        uses: softprops/action-gh-release@6da8fa9354ddfdc4aeace5fc48d7f679b5214090 # v2.4.1
+        uses: softprops/action-gh-release@a06a81a03ee405af7f2048a818ed3f03bbf83c7b # v2.5.0
         with:
             draft: true
             files: |

CXX_for_OpenCL.txt

@@ -1,4 +1,4 @@
-// Copyright 2019-2025 The Khronos Group. This work is licensed under a
+// Copyright 2019-2026 The Khronos Group. This work is licensed under a
 // Creative Commons Attribution 4.0 International License; see
 // http://creativecommons.org/licenses/by/4.0/
 

Makefile

@@ -1,4 +1,4 @@
-# Copyright 2013-2025 The Khronos Group Inc.
+# Copyright 2013-2026 The Khronos Group Inc.
 # SPDX-License-Identifier: Apache-2.0
 
 # OpenCL Specifications Makefile
@@ -118,7 +118,7 @@ ADOCCOMMONOPTS	      = -a apispec="$(CURDIR)/api" \
 			-a cspec="$(CURDIR)/c" \
 			-a images="$(CURDIR)/images" \
 			$(ATTRIBOPTS) $(NOTEOPTS) $(VERBOSE) $(ADOCEXTS)
-ADOCOPTS	      = --failure-level ERROR -d book $(ADOCCOMMONOPTS)
+ADOCOPTS	      = --failure-level WARNING -d book $(ADOCCOMMONOPTS)
 
 # Asciidoctor options to build refpages
 #
@@ -173,16 +173,14 @@ $(OUTDIR)/katex/README.md: katex/README.md
 	$(QUIET)$(RMRF)  $(OUTDIR)/katex
 	$(QUIET)$(CP) -rf katex $(OUTDIR)
 
-all: api env ext extensions cxx c icdinst
+all: api env extensions cxx c icdinst
 
 allman: manhtmlpages
 
 api: apihtml apipdf
 
 env: envhtml envpdf
 
-ext: exthtml extpdf
-
 extensions: extensionshtml extensionspdf
 
 cxx: cxxhtml cxxpdf
@@ -193,13 +191,13 @@ c: chtml cpdf
 
 icdinst: icdinsthtml icdinstpdf
 
-html: apihtml envhtml exthtml extensionshtml cxxhtml chtml icdinsthtml
+html: apihtml envhtml extensionshtml cxxhtml chtml icdinsthtml
 
 # PDF optimizer - usage $(OPTIMIZEPDF) in.pdf out.pdf
 # OPTIMIZEPDFOPTS=--compress-pages is slightly better, but much slower
 OPTIMIZEPDF = hexapdf optimize $(OPTIMIZEPDFOPTS)
 
-pdf: apipdf envpdf extpdf extensionspdf cxxpdf cpdf icdinstpdf
+pdf: apipdf envpdf extensionspdf cxxpdf cpdf icdinstpdf
 
 # Spec targets.
 # There is some complexity to try and avoid short virtual targets like
@@ -256,24 +254,6 @@ $(PDFDIR)/$(ENVSPEC).pdf: $(ENVSPECSRC)
 	$(QUIET)$(ASCIIDOCTOR) -b pdf $(ADOCOPTS) $(ADOCPDFOPTS) -o $@ $(ENVSPEC).txt
 	$(QUIET)$(OPTIMIZEPDF) $@ $@.out.pdf && mv $@.out.pdf $@
 
-# Extensions spec
-EXTSPEC = OpenCL_Ext
-EXTSPECSRC = $(EXTSPEC).txt $(GENDEPENDS) \
-    $(shell scripts/find_adoc_deps $(EXTSPEC).txt $(GENERATED))
-
-exthtml: $(HTMLDIR)/$(EXTSPEC).html $(EXTSPECSRC)
-
-$(HTMLDIR)/$(EXTSPEC).html: $(EXTSPECSRC) $(KATEXINST)
-	$(QUIET)$(ASCIIDOCTOR) -b html5 $(ADOCOPTS) $(ADOCHTMLOPTS) -o $@ $(EXTSPEC).txt
-
-extpdf: $(PDFDIR)/$(EXTSPEC).pdf $(EXTSPECSRC)
-
-$(PDFDIR)/$(EXTSPEC).pdf: $(EXTSPECSRC)
-	$(QUIET)$(MKDIR) $(PDFDIR)
-	$(QUIET)$(MKDIR) $(PDFMATHDIR)
-	$(QUIET)$(ASCIIDOCTOR) -b pdf $(ADOCOPTS) $(ADOCPDFOPTS) -o $@ $(EXTSPEC).txt
-	$(QUIET)$(OPTIMIZEPDF) $@ $@.out.pdf && mv $@.out.pdf $@
-
 # Individual extensions spec(s)
 EXTDIR = extensions
 EXTENSIONSSPEC = extensions

OpenCL_API.txt

@@ -1,4 +1,4 @@
-// Copyright 2017-2025 The Khronos Group
+// Copyright 2017-2026 The Khronos Group
 // SPDX-License-Identifier: CC-BY-4.0
 
 // Extensions to enable