Merge pull request #286 from cdavis5e/resource-array-dynamic-indexing
Support the shader{Sampled,Storage}ImageArrayDynamicIndexing feature.diff --git a/LICENSE b/LICENSE
index d645695..b02cd99 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,202 +1,115 @@
+Khronos Open Source Contributor License Agreement
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
+In order to clarify the intellectual property license granted with
+Open Source Contributions from any person or entity to any products
+The Khronos Group (“Khronos”) manages or maintains and makes available
+under the www.apache.org/licenses/LICENSE-2.0 license, as indicated by
+a copyright notice that is included in or attached to the product (the
+"Work"), Khronos must have an Open Source Contributor License Grant
+("Grant") on file that has been signed by each Contributor, indicating
+agreement to the license terms below. This license is for your
+protection as a Contributor as well as the protection of Khronos; it
+does not change your rights to use your own Contributions for any
+other purpose.
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+You accept and agree to the following terms and conditions for Your
+present and future Contributions submitted to Khronos. Except for the
+license granted herein to Khronos and recipients of software
+distributed by Khronos, You reserve all right, title, and interest in
+and to Your Contributions.
- 1. Definitions.
+1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
+ "You" (or "Your") shall mean the copyright owner or legal entity
+ authorized by the copyright owner that is making this Grant. For
+ legal entities, the entity making a Contribution and all other
+ entities that directly or indirectly control, are controlled by, or
+ are under common control with that entity are considered to be a
+ single Contributor. For the purposes of this definition, "control"
+ means (i) the power, direct or indirect, to cause the direction or
+ management of such entity, whether by contract or otherwise, or
+ (ii) ownership of fifty percent (50%) or more of the outstanding
+ shares, or (iii) beneficial ownership of such entity.
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
+ "Contribution" shall mean any original work of authorship,
+ including any modifications or additions to an existing work, that
+ is intentionally submitted by You to Khronos for inclusion in, or
+ documentation of, the Work. For the purposes of this definition,
+ "submitted" means any form of electronic, verbal, or written
+ communication sent to Khronos or its representatives, including but
+ not limited to communication on electronic mailing lists, source
+ code control systems, and issue tracking systems that are managed
+ by, or on behalf of, Khronos for the purpose of discussing and
+ improving the Work, but excluding communication that is
+ conspicuously marked or otherwise designated in writing by You as
+ "Not a Contribution."
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
+2. Grant of Copyright License. Subject to the terms and conditions of
+ this Grant, You hereby grant to Khronos and to recipients of
+ software distributed by Khronos a perpetual, worldwide, non-
+ exclusive, no-charge, royalty-free, irrevocable copyright license
+ to reproduce, prepare derivative works of, publicly display,
+ publicly perform, sublicense, and distribute Your Contributions and
+ such derivative works. You acknowledge that Khronos is not
+ obligated to use Your Contribution as part of the Work and may
+ decide to include only Contributions that Khronos considers
+ appropriate.
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
+3. Grant of Patent License. Subject to the terms and conditions of
+ this Grant, You hereby grant to Khronos and to recipients of
+ software distributed by Khronos a perpetual, worldwide, non-
+ exclusive, no-charge, royalty-free, irrevocable (except as stated
+ in this section) patent license to make, have made, use, offer to
+ sell, sell, import, and otherwise transfer the Work, where such
+ license applies only to those patent claims licensable by You that
+ are necessarily infringed by Your Contribution(s) alone or by
+ combination of Your Contribution(s) with the Work to which such
+ Contribution(s) was submitted. If any entity institutes patent
+ litigation against You or any other entity (including a cross-claim
+ or counterclaim in a lawsuit) alleging that your Contribution, or
+ the Work to which you have contributed, constitutes direct or
+ contributory patent infringement, then any patent licenses granted
+ to that entity under this Grant for that Contribution or Work shall
+ terminate as of the date such litigation is filed.
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
+4. Moral Rights. If moral rights apply to Your Contribution, to the
+ maximum extent permitted by law, You waive and agree not to assert
+ such moral rights against Khronos, our successors in interest, or
+ any of our licensees, either direct or indirect.
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
+5. You represent that you are legally entitled to grant the above
+ license. If your employer(s) has rights to intellectual property
+ that you create that includes your Contributions, you represent
+ that you have received permission to make Contributions on behalf
+ of that employer, that your employer has waived such rights for
+ your Contributions to Khronos, or that your employer has executed a
+ separate Corporate Contributor License Grant with Khronos.
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
+6. You represent that each of Your Contributions is Your original
+ creation (see section 8 for submissions on behalf of others). You
+ represent that Your Contribution submissions include complete
+ details of any third-party license or other restriction (including,
+ but not limited to, related patents and trademarks) of which you
+ are personally aware and which are associated with any part of Your
+ Contributions.
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
+7. You are not expected to provide support for Your Contributions,
+ except to the extent You desire to provide support. You may provide
+ support for free, for a fee, or not at all. Unless required by
+ applicable law or agreed to in writing, You provide Your
+ Contributions on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS
+ OF ANY KIND, either express or implied, including, without
+ limitation, any warranties or conditions of TITLE, NON-
+ INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A PARTICULAR PURPOSE.
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
+8. Should You wish to submit work that is not Your original creation,
+ You may submit it to Khronos separately from any other
+ Contribution, identifying the complete details of its source and of
+ any license or other restriction (including, but not limited to,
+ related patents, trademarks, and license agreements) of which you
+ are personally aware, and conspicuously marking the work as
+ "Submitted on behalf of a third-party: [named here]".
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
+9. You agree to notify Khronos of any facts or circumstances of which
+ you become aware that would make these representations inaccurate
+ in any respect.
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm b/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
index 0f8f9f9..3200b54 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKPipeline.mm
@@ -398,6 +398,18 @@
if (mvkMTLPixelFormatIsDepthFormat(mtlDSFormat)) { plDesc.depthAttachmentPixelFormat = mtlDSFormat; }
if (mvkMTLPixelFormatIsStencilFormat(mtlDSFormat)) { plDesc.stencilAttachmentPixelFormat = mtlDSFormat; }
+ // In Vulkan, it's perfectly valid to do rasterization with no attachments.
+ // Not so in Metal. If we have no attachments and rasterization is enabled,
+ // then we'll have to add a dummy attachment.
+ if (plDesc.rasterizationEnabled &&
+ (!pCreateInfo->pColorBlendState || !pCreateInfo->pColorBlendState->attachmentCount) &&
+ !mvkMTLPixelFormatIsDepthFormat(mtlDSFormat) &&
+ !mvkMTLPixelFormatIsStencilFormat(mtlDSFormat)) {
+ MTLRenderPipelineColorAttachmentDescriptor* colorDesc = plDesc.colorAttachments[0];
+ colorDesc.pixelFormat = MTLPixelFormatR8Unorm;
+ colorDesc.writeMask = MTLColorWriteMaskNone;
+ }
+
// Multisampling
if (pCreateInfo->pMultisampleState) {
plDesc.sampleCount = mvkSampleCountFromVkSampleCountFlagBits(pCreateInfo->pMultisampleState->rasterizationSamples);
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h b/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
index 776a901..43fc8f1 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.h
@@ -80,6 +80,7 @@
std::vector<VkAttachmentReference> _resolveAttachments;
std::vector<uint32_t> _preserveAttachments;
VkAttachmentReference _depthStencilAttachment;
+ id<MTLTexture> _mtlDummyTex = nil;
};
diff --git a/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm b/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
index 0986215..a4216d9 100644
--- a/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
+++ b/MoltenVK/MoltenVK/GPUObjects/MVKRenderPass.mm
@@ -115,6 +115,36 @@
}
}
}
+
+ _mtlDummyTex = nil;
+ if (caCnt == 0 && dsRPAttIdx == VK_ATTACHMENT_UNUSED) {
+ // Add a dummy attachment so this passes validation.
+ VkExtent2D fbExtent = framebuffer->getExtent2D();
+ MTLTextureDescriptor* mtlTexDesc = [MTLTextureDescriptor texture2DDescriptorWithPixelFormat: MTLPixelFormatR8Unorm width: fbExtent.width height: fbExtent.height mipmapped: NO];
+ if (framebuffer->getLayerCount() > 1) {
+ mtlTexDesc.textureType = MTLTextureType2DArray;
+ mtlTexDesc.arrayLength = framebuffer->getLayerCount();
+ }
+#if MVK_IOS
+ if ([_renderPass->getDevice()->getMTLDevice() supportsFeatureSet: MTLFeatureSet_iOS_GPUFamily1_v3]) {
+ mtlTexDesc.storageMode = MTLStorageModeMemoryless;
+ } else {
+ mtlTexDesc.storageMode = MTLStorageModePrivate;
+ }
+#else
+ mtlTexDesc.storageMode = MTLStorageModePrivate;
+#endif
+ mtlTexDesc.usage = MTLTextureUsageRenderTarget;
+ _mtlDummyTex = [_renderPass->getDevice()->getMTLDevice() newTextureWithDescriptor: mtlTexDesc]; // not retained
+ [_mtlDummyTex setPurgeableState: MTLPurgeableStateVolatile];
+ MTLRenderPassColorAttachmentDescriptor* mtlColorAttDesc = mtlRPDesc.colorAttachments[0];
+ mtlColorAttDesc.texture = _mtlDummyTex;
+ mtlColorAttDesc.level = 0;
+ mtlColorAttDesc.slice = 0;
+ mtlColorAttDesc.depthPlane = 0;
+ mtlColorAttDesc.loadAction = MTLLoadActionDontCare;
+ mtlColorAttDesc.storeAction = MTLStoreActionDontCare;
+ }
}
void MVKRenderSubpass::populateClearAttachments(vector<VkClearAttachment>& clearAtts,
diff --git a/MoltenVK/scripts/create_dylib_macos.sh b/MoltenVK/scripts/create_dylib_macos.sh
index be0ebfa..2cf63b0 100755
--- a/MoltenVK/scripts/create_dylib_macos.sh
+++ b/MoltenVK/scripts/create_dylib_macos.sh
@@ -8,8 +8,12 @@
export MVK_SYS_FWK_DIR="${SDK_DIR}/System/Library/Frameworks"
export MVK_USR_LIB_DIR="${SDK_DIR}/usr/lib"
+if test x"${ENABLE_THREAD_SANITIZER}" = xYES; then
+ MVK_TSAN="-fsanitize=thread"
+fi
+
clang \
--dynamiclib \
+-dynamiclib ${MVK_TSAN} \
-arch x86_64 \
-mmacosx-version-min=${MACOSX_DEPLOYMENT_TARGET} \
-compatibility_version 1.0.0 -current_version 1.0.0 \
