Merge branch 'main' into usm-v1.1

.github/workflows/presubmit.yml

@@ -47,10 +47,14 @@ jobs:
         run: |
           python3 makeSpec -clean -spec core OUTDIR=out.core -j 5 -O api c env ext cxx4opencl
 
-      - name: Generate core + extension specs (HTML)
+      - name: Generate core + KHR extension specs (HTML)
         run: |
           python3 makeSpec -clean -spec khr OUTDIR=out.khr -j -O html
 
+      - name: Generate core + KHR + EXT extension specs (HTML)
+        run: |
+          python3 makeSpec -clean -spec khr+ext OUTDIR=out.khr+ext -j -O html
+
       - name: Generate reference pages
         run: |
           python3 makeSpec -spec khr OUTDIR=out.refpages -j -O manhtmlpages

Makefile

@@ -97,6 +97,7 @@ COMMONATTRIBOPTS	= -a revdate="$(SPECDATE)" \
 			  -a stem=latexmath \
 			  -a generated=$(GENERATED) \
 			  -a sectnumlevels=5 \
+			  -a nofooter \
 			  -a refprefix
 
 ATTRIBOPTS   = -a revnumber="$(SPECREVISION)" \
@@ -512,9 +513,13 @@ $(MANHTMLDIR)/intro.html: $(REFPATH)/intro.txt $(MANCOPYRIGHT)
 
 REGISTRY       = $(ROOTDIR)/xml
 APIXML	       = $(REGISTRY)/cl.xml
+CFEATURES      = c/features.txt
+CFUNCTIONS     = c/functions.txt
 GENSCRIPT      = $(SCRIPTS)/gencl.py
 DICTSCRIPT     = $(SCRIPTS)/gen_dictionaries.py
 VERSIONSCRIPT  = $(SCRIPTS)/gen_version_notes.py
+CFEATSCRIPT    = $(SCRIPTS)/gen_dictionary_from_file.py
+CFUNCSCRIPT    = $(SCRIPTS)/gen_dictionary_from_file.py
 GENSCRIPTOPTS  = $(VERSIONOPTIONS) $(EXTOPTIONS) $(GENSCRIPTEXTRA) -registry $(APIXML)
 GENSCRIPTEXTRA =
 
@@ -540,6 +545,8 @@ extinc: $(METADEPEND)
 $(METADEPEND): $(APIXML) $(GENSCRIPT)
 	$(QUIET)$(MKDIR) $(METAPATH)
 	$(QUIET)$(PYTHON) $(GENSCRIPT) $(GENSCRIPTOPTS) -o $(METAPATH) extinc
+	$(QUIET)$(PYTHON) $(CFEATSCRIPT) -i $(CFEATURES) -o $(METAPATH)/c-feature-dictionary.asciidoc
+	$(QUIET)$(PYTHON) $(CFUNCSCRIPT) -i $(CFUNCTIONS) -o $(METAPATH)/c-function-dictionary.asciidoc
 
 # This generates a single file containing asciidoc attributes for each
 # extension in the spec being built.