Skip to content

Commit 681ef20

Browse files
Merge remote-tracking branch 'upstream/main'
2 parents 3d29ed8 + d1eb455 commit 681ef20

37 files changed

Lines changed: 2246 additions & 1113 deletions

.github/workflows/presubmit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ jobs:
2020
container: khronosgroup/docker-images@sha256:4aab96a03ef292439c9bd0f972adfa29cdf838d0909b1cb4ec2a6d7b2d14a37f
2121

2222
steps:
23-
- uses: actions/checkout@v4
23+
- uses: actions/checkout@v5
2424
with:
2525
submodules: recursive
2626
# If fetch-depth: 0 is not specified, then

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ jobs:
2222

2323
steps:
2424
- name: Get Spec Source
25-
uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
25+
uses: actions/checkout@ff7abcd0c3c05ccf6adc123a8cd1fd4fb30fb493 # v4.2.2
2626
with:
2727
submodules: recursive
2828
# If fetch-depth: 0 is not specified, then
@@ -46,7 +46,7 @@ jobs:
4646
python3 makeSpec -clean -spec khr+ext OUTDIR=out.release -j 5 api c env ext cxx4opencl
4747
4848
- name: Release Specs
49-
uses: softprops/action-gh-release@da05d552573ad5aba039eaac05058a918a7bf631 # v2.2.2
49+
uses: softprops/action-gh-release@6cbd405e2c4e67a21c47fa9e383d020e4e28b836 # v2.3.3
5050
with:
5151
draft: true
5252
files: |

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -517,6 +517,7 @@ CFEATURES = c/features.txt
517517
CFUNCTIONS = c/functions.txt
518518
GENSCRIPT = $(SCRIPTS)/gencl.py
519519
DICTSCRIPT = $(SCRIPTS)/gen_dictionaries.py
520+
EXTIFACESSCRIPT= $(SCRIPTS)/gen_extension_interfaces.py
520521
VERSIONSCRIPT = $(SCRIPTS)/gen_version_notes.py
521522
CFEATSCRIPT = $(SCRIPTS)/gen_dictionary_from_file.py
522523
CFUNCSCRIPT = $(SCRIPTS)/gen_dictionary_from_file.py
@@ -542,11 +543,13 @@ $(APIDEPEND): $(APIXML) $(DICTSCRIPT) $(GENSCRIPT) $(VERSIONSCRIPT)
542543

543544
extinc: $(METADEPEND)
544545

545-
$(METADEPEND): $(APIXML) $(GENSCRIPT)
546+
$(METADEPEND): $(APIXML) $(GENSCRIPT) $(CFEATSCRIPT) $(EXTIFACESSCRIPT)
546547
$(QUIET)$(MKDIR) $(METAPATH)
548+
$(QUIET)$(MKDIR) $(METAPATH)/interfaces
547549
$(QUIET)$(PYTHON) $(GENSCRIPT) $(GENSCRIPTOPTS) -o $(METAPATH) extinc
548550
$(QUIET)$(PYTHON) $(CFEATSCRIPT) -i $(CFEATURES) -o $(METAPATH)/c-feature-dictionary.asciidoc
549551
$(QUIET)$(PYTHON) $(CFUNCSCRIPT) -i $(CFUNCTIONS) -o $(METAPATH)/c-function-dictionary.asciidoc
552+
$(QUIET)$(PYTHON) $(EXTIFACESSCRIPT) -registry $(APIXML) -o $(METAPATH)/interfaces
550553

551554
# This generates a single file containing asciidoc attributes for each
552555
# extension in the spec being built.

0 commit comments

Comments
 (0)