Skip to content

Commit

Permalink
Merge pull request #495 from KhronosGroup/reflow2
Browse files Browse the repository at this point in the history
Run Reflow, rebased from master

(cherry picked from commit e859ef7)
  • Loading branch information
gmlueck committed Nov 7, 2024
1 parent 998b8c7 commit b980fb9
Show file tree
Hide file tree
Showing 23 changed files with 7,280 additions and 6,129 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

steps:
# Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
- uses: actions/checkout@v2
- uses: actions/checkout@v4

# Unfortunately, asciidoctor-pdf gets pathname-specific errors
# building under the usual $GITHUB_WORKSPACE (/__w). As a workaround,
Expand All @@ -40,8 +40,11 @@ jobs:
run: |
cd adoc
make OUTDIR=/tmp/out QUIET= html pdf
- name: Verify reflow conformance
run: |
./adoc/scripts/verify_reflow_conformance.sh
- name: Archive generated files
uses: actions/upload-artifact@v2
uses: actions/upload-artifact@v3
with:
name: spec-outputs
path: |
Expand Down
2 changes: 1 addition & 1 deletion adoc/chapters/acknowledgements.adoc
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
* Jon Leech, Luna Princeps LLC
* Kathleen Mattson, Miller & Mattson, LLC
* Dave Miller, Miller & Mattson, LLC
* Stéphanie Even, Mercedes-Benz Research and Development NA
* Stéphanie Even, Mercedes-Benz Research and Development NA
* Chris Gearing, Mobileye
* Seiji Nishimura, NSITEXE, Inc.
* Neil Trevett, NVIDIA
Expand Down
2,086 changes: 1,087 additions & 999 deletions adoc/chapters/architecture.adoc

Large diffs are not rendered by default.

103 changes: 52 additions & 51 deletions adoc/chapters/copyright-spec.adoc
Original file line number Diff line number Diff line change
@@ -1,35 +1,35 @@
Copyright (c) 2011-2023 The Khronos Group, Inc.

This Specification is protected by copyright laws and contains material
proprietary to Khronos. Except as described by these terms, it or any
components may not be reproduced, republished, distributed, transmitted,
displayed, broadcast or otherwise exploited in any manner without the
express prior written permission of Khronos.
proprietary to Khronos.
Except as described by these terms, it or any components may not be reproduced,
republished, distributed, transmitted, displayed, broadcast or otherwise
exploited in any manner without the express prior written permission of Khronos.
Khronos grants a conditional copyright license to use and reproduce the
unmodified Specification for any purpose, without fee or royalty, EXCEPT no
licenses to any patent, trademark or other intellectual property rights are
granted under these terms.

Khronos makes no, and expressly disclaims any, representations or
warranties, express or implied, regarding this Specification, including,
without limitation: merchantability, fitness for a particular purpose,
non-infringement of any intellectual property, correctness, accuracy,
completeness, timeliness, and reliability.
Under no circumstances will Khronos, or any of its Promoters, Contributors
or Members, or their respective partners, officers, directors, employees,
agents or representatives be liable for any damages, whether direct,
indirect, special or consequential damages for lost revenues, lost profits,
or otherwise, arising from or in connection with these materials.
Khronos makes no, and expressly disclaims any, representations or warranties,
express or implied, regarding this Specification, including, without limitation:
merchantability, fitness for a particular purpose, non-infringement of any
intellectual property, correctness, accuracy, completeness, timeliness, and
reliability.
Under no circumstances will Khronos, or any of its Promoters, Contributors or
Members, or their respective partners, officers, directors, employees, agents or
representatives be liable for any damages, whether direct, indirect, special or
consequential damages for lost revenues, lost profits, or otherwise, arising
from or in connection with these materials.

This Specification has been created under the Khronos Intellectual Property
Rights Policy, which is Attachment A of the Khronos Group Membership
Agreement available at https://www.khronos.org/files/member_agreement.pdf, and which
Rights Policy, which is Attachment A of the Khronos Group Membership Agreement
available at https://www.khronos.org/files/member_agreement.pdf, and which
defines the terms 'Scope', 'Compliant Portion', and 'Necessary Patent Claims'.
Parties desiring to implement the Specification and make use of Khronos trademarks
in relation to that implementation, and receive reciprocal patent license protection
under the Khronos Intellectual Property Rights Policy must become Adopters and
confirm the implementation as conformant under the process defined by Khronos for
this Specification; see https://www.khronos.org/adopters.
Parties desiring to implement the Specification and make use of Khronos
trademarks in relation to that implementation, and receive reciprocal patent
license protection under the Khronos Intellectual Property Rights Policy must
become Adopters and confirm the implementation as conformant under the process
defined by Khronos for this Specification; see https://www.khronos.org/adopters.

Some parts of this Specification are purely informative and so are EXCLUDED from
the Scope of this Specification.
Expand All @@ -39,42 +39,43 @@ the Scope of this Specification.
// The <<introduction-conventions>> section of the
// <<introduction>> defines how these parts of the Specification are identified.

Where this Specification uses technical
terminology, defined in the <<glossary>> or otherwise, that refer to
enabling technologies that are not expressly set forth in this
Specification, those enabling technologies are EXCLUDED from the Scope of
this Specification.
Where this Specification uses technical terminology, defined in the <<glossary>>
or otherwise, that refer to enabling technologies that are not expressly set
forth in this Specification, those enabling technologies are EXCLUDED from the
Scope of this Specification.
For clarity, enabling technologies not disclosed with particularity in this
Specification (e.g. semiconductor manufacturing technology, hardware
architecture, processor architecture or microarchitecture, memory
architecture, compiler technology, object oriented technology, basic
operating system technology, compression technology, algorithms, and so on)
are NOT to be considered expressly set forth; only those application program
interfaces and data structures disclosed with particularity are included in
the Scope of this Specification.
architecture, processor architecture or microarchitecture, memory architecture,
compiler technology, object oriented technology, basic operating system
technology, compression technology, algorithms, and so on) are NOT to be
considered expressly set forth; only those application program interfaces and
data structures disclosed with particularity are included in the Scope of this
Specification.

For purposes of the Khronos Intellectual Property Rights Policy as it relates
to the definition of Necessary Patent Claims, all recommended or optional
features, behaviors and functionality set forth in this Specification, if
implemented, are considered to be included as Compliant Portions.
For purposes of the Khronos Intellectual Property Rights Policy as it relates to
the definition of Necessary Patent Claims, all recommended or optional features,
behaviors and functionality set forth in this Specification, if implemented, are
considered to be included as Compliant Portions.

Where this Specification includes
normative references to external documents, only the specifically
identified sections of those external documents are INCLUDED in the Scope of
this Specification. If not created by Khronos, those external documents may
contain contributions from non-members of Khronos not covered by the Khronos
Intellectual Property Rights Policy.
Where this Specification includes normative references to external documents,
only the specifically identified sections of those external documents are
INCLUDED in the Scope of this Specification.
If not created by Khronos, those external documents may contain contributions
from non-members of Khronos not covered by the Khronos Intellectual Property
Rights Policy.

ifndef::ratified_core_spec[]
This document contains extensions which are not ratified by Khronos, and as
such is not a ratified Specification, though it contains text from (and is a
superset of) the ratified SYCL Specification. The ratified version of the
SYCL Specification can be found at
This document contains extensions which are not ratified by Khronos, and as such
is not a ratified Specification, though it contains text from (and is a superset
of) the ratified SYCL Specification.
The ratified version of the SYCL Specification can be found at
https://www.khronos.org/registry/SYCL .
endif::ratified_core_spec[]

Khronos and Vulkan are registered trademarks, and SPIR-V is a trademark of
The Khronos Group Inc. OpenCL is a trademark of Apple Inc. and OpenGL is a
registered trademarks of Hewlett Packard Enterprise, all used under license
by Khronos. All other product names, trademarks, and/or company names are
used solely for identification and belong to their respective owners.
Khronos and Vulkan are registered trademarks, and SPIR-V is a trademark of The
Khronos Group Inc.
OpenCL is a trademark of Apple Inc.
and OpenGL is a registered trademarks of Hewlett Packard Enterprise, all used
under license by Khronos.
All other product names, trademarks, and/or company names are used solely for
identification and belong to their respective owners.
Loading

0 comments on commit b980fb9

Please sign in to comment.