Merge pull request #45021 from akien-mga/spirv-reflect-c0ce03a
spirv-reflect: Update to upstream commit c0ce03a (Jan 6, 2021)
This commit is contained in:
commit
98ccaa1bad
|
@ -4061,6 +4061,10 @@ RID RenderingDeviceVulkan::shader_create(const Vector<ShaderStageData> &p_stages
|
|||
layout_binding.descriptorType = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT;
|
||||
info.type = UNIFORM_TYPE_INPUT_ATTACHMENT;
|
||||
} break;
|
||||
case SPV_REFLECT_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR: {
|
||||
ERR_PRINT("Acceleration structure not supported.");
|
||||
continue;
|
||||
} break;
|
||||
}
|
||||
|
||||
if (need_array_dimensions) {
|
||||
|
|
|
@ -571,13 +571,14 @@ Godot. Please check the file to know what's new.
|
|||
## spirv-reflect
|
||||
|
||||
- Upstream: https://github.com/KhronosGroup/SPIRV-Reflect
|
||||
- Version: git (bc3c0d63b6dadcde3f08bcd6fdc5ab98a31354da, 2019)
|
||||
- Version: git (c0ce03a43ca77fedb5abfd1976ae2fd0eeb0e611, 2021)
|
||||
- License: Apache 2.0
|
||||
|
||||
Files extracted from upstream source:
|
||||
|
||||
- `spirv_reflect.{c,h}`
|
||||
- `include` folder
|
||||
- `LICENSE`
|
||||
|
||||
|
||||
## squish
|
||||
|
|
|
@ -0,0 +1,201 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"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.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"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.
|
||||
|
||||
"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).
|
||||
|
||||
"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.
|
||||
|
||||
"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."
|
||||
|
||||
"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.
|
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
@ -72,26 +72,29 @@ typedef enum SpvReflectResult {
|
|||
SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_INSTRUCTION,
|
||||
SPV_REFLECT_RESULT_ERROR_SPIRV_UNEXPECTED_BLOCK_DATA,
|
||||
SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_BLOCK_MEMBER_REFERENCE,
|
||||
SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_ENTRY_POINT,
|
||||
SPV_REFLECT_RESULT_ERROR_SPIRV_INVALID_EXECUTION_MODE,
|
||||
} SpvReflectResult;
|
||||
|
||||
/*! @enum SpvReflectTypeFlagBits
|
||||
|
||||
*/
|
||||
typedef enum SpvReflectTypeFlagBits {
|
||||
SPV_REFLECT_TYPE_FLAG_UNDEFINED = 0x00000000,
|
||||
SPV_REFLECT_TYPE_FLAG_VOID = 0x00000001,
|
||||
SPV_REFLECT_TYPE_FLAG_BOOL = 0x00000002,
|
||||
SPV_REFLECT_TYPE_FLAG_INT = 0x00000004,
|
||||
SPV_REFLECT_TYPE_FLAG_FLOAT = 0x00000008,
|
||||
SPV_REFLECT_TYPE_FLAG_VECTOR = 0x00000100,
|
||||
SPV_REFLECT_TYPE_FLAG_MATRIX = 0x00000200,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_IMAGE = 0x00010000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_SAMPLER = 0x00020000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_SAMPLED_IMAGE = 0x00040000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_BLOCK = 0x00080000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_MASK = 0x000F0000,
|
||||
SPV_REFLECT_TYPE_FLAG_STRUCT = 0x10000000,
|
||||
SPV_REFLECT_TYPE_FLAG_ARRAY = 0x20000000,
|
||||
SPV_REFLECT_TYPE_FLAG_UNDEFINED = 0x00000000,
|
||||
SPV_REFLECT_TYPE_FLAG_VOID = 0x00000001,
|
||||
SPV_REFLECT_TYPE_FLAG_BOOL = 0x00000002,
|
||||
SPV_REFLECT_TYPE_FLAG_INT = 0x00000004,
|
||||
SPV_REFLECT_TYPE_FLAG_FLOAT = 0x00000008,
|
||||
SPV_REFLECT_TYPE_FLAG_VECTOR = 0x00000100,
|
||||
SPV_REFLECT_TYPE_FLAG_MATRIX = 0x00000200,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_IMAGE = 0x00010000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_SAMPLER = 0x00020000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_SAMPLED_IMAGE = 0x00040000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_BLOCK = 0x00080000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_ACCELERATION_STRUCTURE = 0x00100000,
|
||||
SPV_REFLECT_TYPE_FLAG_EXTERNAL_MASK = 0x00FF0000,
|
||||
SPV_REFLECT_TYPE_FLAG_STRUCT = 0x10000000,
|
||||
SPV_REFLECT_TYPE_FLAG_ARRAY = 0x20000000,
|
||||
} SpvReflectTypeFlagBits;
|
||||
|
||||
typedef uint32_t SpvReflectTypeFlags;
|
||||
|
@ -141,6 +144,18 @@ typedef enum SpvReflectFormat {
|
|||
SPV_REFLECT_FORMAT_R32G32B32A32_UINT = 107, // = VK_FORMAT_R32G32B32A32_UINT
|
||||
SPV_REFLECT_FORMAT_R32G32B32A32_SINT = 108, // = VK_FORMAT_R32G32B32A32_SINT
|
||||
SPV_REFLECT_FORMAT_R32G32B32A32_SFLOAT = 109, // = VK_FORMAT_R32G32B32A32_SFLOAT
|
||||
SPV_REFLECT_FORMAT_R64_UINT = 110, // = VK_FORMAT_R64_UINT
|
||||
SPV_REFLECT_FORMAT_R64_SINT = 111, // = VK_FORMAT_R64_SINT
|
||||
SPV_REFLECT_FORMAT_R64_SFLOAT = 112, // = VK_FORMAT_R64_SFLOAT
|
||||
SPV_REFLECT_FORMAT_R64G64_UINT = 113, // = VK_FORMAT_R64G64_UINT
|
||||
SPV_REFLECT_FORMAT_R64G64_SINT = 114, // = VK_FORMAT_R64G64_SINT
|
||||
SPV_REFLECT_FORMAT_R64G64_SFLOAT = 115, // = VK_FORMAT_R64G64_SFLOAT
|
||||
SPV_REFLECT_FORMAT_R64G64B64_UINT = 116, // = VK_FORMAT_R64G64B64_UINT
|
||||
SPV_REFLECT_FORMAT_R64G64B64_SINT = 117, // = VK_FORMAT_R64G64B64_SINT
|
||||
SPV_REFLECT_FORMAT_R64G64B64_SFLOAT = 118, // = VK_FORMAT_R64G64B64_FLOAT
|
||||
SPV_REFLECT_FORMAT_R64G64B64A64_UINT = 119, // = VK_FORMAT_R64G64B64A64_UINT
|
||||
SPV_REFLECT_FORMAT_R64G64B64A64_SINT = 120, // = VK_FORMAT_R64G64B64A64_SINT
|
||||
SPV_REFLECT_FORMAT_R64G64B64A64_SFLOAT = 121, // = VK_FORMAT_R64G64B64A64_SFLOAT
|
||||
} SpvReflectFormat;
|
||||
|
||||
/*! @enum SpvReflectVariableFlagBits
|
||||
|
@ -157,17 +172,18 @@ typedef uint32_t SpvReflectVariableFlags;
|
|||
|
||||
*/
|
||||
typedef enum SpvReflectDescriptorType {
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLER = 0, // = VK_DESCRIPTOR_TYPE_SAMPLER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER = 1, // = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLED_IMAGE = 2, // = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE = 3, // = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER = 4, // = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER = 5, // = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER = 6, // = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER = 7, // = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8, // = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9, // = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10, // = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLER = 0, // = VK_DESCRIPTOR_TYPE_SAMPLER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER = 1, // = VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_SAMPLED_IMAGE = 2, // = VK_DESCRIPTOR_TYPE_SAMPLED_IMAGE
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_IMAGE = 3, // = VK_DESCRIPTOR_TYPE_STORAGE_IMAGE
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER = 4, // = VK_DESCRIPTOR_TYPE_UNIFORM_TEXEL_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER = 5, // = VK_DESCRIPTOR_TYPE_STORAGE_TEXEL_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER = 6, // = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER = 7, // = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC = 8, // = VK_DESCRIPTOR_TYPE_UNIFORM_BUFFER_DYNAMIC
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC = 9, // = VK_DESCRIPTOR_TYPE_STORAGE_BUFFER_DYNAMIC
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_INPUT_ATTACHMENT = 10, // = VK_DESCRIPTOR_TYPE_INPUT_ATTACHMENT
|
||||
SPV_REFLECT_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR = 1000150000 // = VK_DESCRIPTOR_TYPE_ACCELERATION_STRUCTURE_KHR
|
||||
} SpvReflectDescriptorType;
|
||||
|
||||
/*! @enum SpvReflectShaderStageFlagBits
|
||||
|
@ -180,6 +196,15 @@ typedef enum SpvReflectShaderStageFlagBits {
|
|||
SPV_REFLECT_SHADER_STAGE_GEOMETRY_BIT = 0x00000008, // = VK_SHADER_STAGE_GEOMETRY_BIT
|
||||
SPV_REFLECT_SHADER_STAGE_FRAGMENT_BIT = 0x00000010, // = VK_SHADER_STAGE_FRAGMENT_BIT
|
||||
SPV_REFLECT_SHADER_STAGE_COMPUTE_BIT = 0x00000020, // = VK_SHADER_STAGE_COMPUTE_BIT
|
||||
SPV_REFLECT_SHADER_STAGE_TASK_BIT_NV = 0x00000040, // = VK_SHADER_STAGE_TASK_BIT_NV
|
||||
SPV_REFLECT_SHADER_STAGE_MESH_BIT_NV = 0x00000080, // = VK_SHADER_STAGE_MESH_BIT_NV
|
||||
SPV_REFLECT_SHADER_STAGE_RAYGEN_BIT_KHR = 0x00000100, // VK_SHADER_STAGE_RAYGEN_BIT_KHR
|
||||
SPV_REFLECT_SHADER_STAGE_ANY_HIT_BIT_KHR = 0x00000200, // VK_SHADER_STAGE_ANY_HIT_BIT_KHR
|
||||
SPV_REFLECT_SHADER_STAGE_CLOSEST_HIT_BIT_KHR = 0x00000400, // VK_SHADER_STAGE_CLOSEST_HIT_BIT_KHR
|
||||
SPV_REFLECT_SHADER_STAGE_MISS_BIT_KHR = 0x00000800, // VK_SHADER_STAGE_MISS_BIT_KHR
|
||||
SPV_REFLECT_SHADER_STAGE_INTERSECTION_BIT_KHR = 0x00001000, // VK_SHADER_STAGE_INTERSECTION_BIT_KHR
|
||||
SPV_REFLECT_SHADER_STAGE_CALLABLE_BIT_KHR = 0x00002000, // VK_SHADER_STAGE_CALLABLE_BIT_KHR
|
||||
|
||||
} SpvReflectShaderStageFlagBits;
|
||||
|
||||
/*! @enum SpvReflectGenerator
|
||||
|
@ -365,10 +390,12 @@ typedef struct SpvReflectEntryPoint {
|
|||
SpvExecutionModel spirv_execution_model;
|
||||
SpvReflectShaderStageFlagBits shader_stage;
|
||||
|
||||
uint32_t input_variable_count;
|
||||
SpvReflectInterfaceVariable* input_variables;
|
||||
uint32_t output_variable_count;
|
||||
SpvReflectInterfaceVariable* output_variables;
|
||||
uint32_t input_variable_count;
|
||||
SpvReflectInterfaceVariable** input_variables;
|
||||
uint32_t output_variable_count;
|
||||
SpvReflectInterfaceVariable** output_variables;
|
||||
uint32_t interface_variable_count;
|
||||
SpvReflectInterfaceVariable* interface_variables;
|
||||
|
||||
uint32_t descriptor_set_count;
|
||||
SpvReflectDescriptorSet* descriptor_sets;
|
||||
|
@ -377,6 +404,12 @@ typedef struct SpvReflectEntryPoint {
|
|||
uint32_t* used_uniforms;
|
||||
uint32_t used_push_constant_count;
|
||||
uint32_t* used_push_constants;
|
||||
|
||||
struct LocalSize {
|
||||
uint32_t x;
|
||||
uint32_t y;
|
||||
uint32_t z;
|
||||
} local_size;
|
||||
} SpvReflectEntryPoint;
|
||||
|
||||
/*! @struct SpvReflectShaderModule
|
||||
|
@ -398,10 +431,12 @@ typedef struct SpvReflectShaderModule {
|
|||
SpvReflectDescriptorBinding* descriptor_bindings;
|
||||
uint32_t descriptor_set_count;
|
||||
SpvReflectDescriptorSet descriptor_sets[SPV_REFLECT_MAX_DESCRIPTOR_SETS];
|
||||
uint32_t input_variable_count;
|
||||
SpvReflectInterfaceVariable* input_variables;
|
||||
uint32_t output_variable_count;
|
||||
SpvReflectInterfaceVariable* output_variables;
|
||||
uint32_t input_variable_count;
|
||||
SpvReflectInterfaceVariable** input_variables;
|
||||
uint32_t output_variable_count;
|
||||
SpvReflectInterfaceVariable** output_variables;
|
||||
uint32_t interface_variable_count;
|
||||
SpvReflectInterfaceVariable* interface_variables;
|
||||
uint32_t push_constant_block_count;
|
||||
SpvReflectBlockVariable* push_constant_blocks;
|
||||
|
||||
|
@ -582,6 +617,58 @@ SpvReflectResult spvReflectEnumerateEntryPointDescriptorSets(
|
|||
);
|
||||
|
||||
|
||||
/*! @fn spvReflectEnumerateInterfaceVariables
|
||||
@brief If the module contains multiple entry points, this will only get
|
||||
the interface variables for the first one.
|
||||
@param p_module Pointer to an instance of SpvReflectShaderModule.
|
||||
@param p_count If pp_variables is NULL, the module's interface variable
|
||||
count will be stored here.
|
||||
If pp_variables is not NULL, *p_count must contain
|
||||
the module's interface variable count.
|
||||
@param pp_variables If NULL, the module's interface variable count will be
|
||||
written to *p_count.
|
||||
If non-NULL, pp_variables must point to an array with
|
||||
*p_count entries, where pointers to the module's
|
||||
interface variables will be written. The caller must not
|
||||
free the interface variables written to this array.
|
||||
@return If successful, returns SPV_REFLECT_RESULT_SUCCESS.
|
||||
Otherwise, the error code indicates the cause of the
|
||||
failure.
|
||||
|
||||
*/
|
||||
SpvReflectResult spvReflectEnumerateInterfaceVariables(
|
||||
const SpvReflectShaderModule* p_module,
|
||||
uint32_t* p_count,
|
||||
SpvReflectInterfaceVariable** pp_variables
|
||||
);
|
||||
|
||||
/*! @fn spvReflectEnumerateEntryPointInterfaceVariables
|
||||
@brief Enumerate the interface variables for a given entry point.
|
||||
@param entry_point The name of the entry point to get the interface variables for.
|
||||
@param p_module Pointer to an instance of SpvReflectShaderModule.
|
||||
@param p_count If pp_variables is NULL, the entry point's interface variable
|
||||
count will be stored here.
|
||||
If pp_variables is not NULL, *p_count must contain
|
||||
the entry point's interface variable count.
|
||||
@param pp_variables If NULL, the entry point's interface variable count will be
|
||||
written to *p_count.
|
||||
If non-NULL, pp_variables must point to an array with
|
||||
*p_count entries, where pointers to the entry point's
|
||||
interface variables will be written. The caller must not
|
||||
free the interface variables written to this array.
|
||||
@return If successful, returns SPV_REFLECT_RESULT_SUCCESS.
|
||||
Otherwise, the error code indicates the cause of the
|
||||
failure.
|
||||
|
||||
*/
|
||||
SpvReflectResult spvReflectEnumerateEntryPointInterfaceVariables(
|
||||
const SpvReflectShaderModule* p_module,
|
||||
const char* entry_point,
|
||||
uint32_t* p_count,
|
||||
SpvReflectInterfaceVariable** pp_variables
|
||||
);
|
||||
|
||||
|
||||
/*! @fn spvReflectEnumerateInputVariables
|
||||
@brief If the module contains multiple entry points, this will only get
|
||||
the input variables for the first one.
|
||||
|
@ -1310,10 +1397,12 @@ public:
|
|||
SpvReflectResult EnumerateEntryPointDescriptorBindings(const char* entry_point, uint32_t* p_count, SpvReflectDescriptorBinding** pp_bindings) const;
|
||||
SpvReflectResult EnumerateDescriptorSets( uint32_t* p_count, SpvReflectDescriptorSet** pp_sets) const ;
|
||||
SpvReflectResult EnumerateEntryPointDescriptorSets(const char* entry_point, uint32_t* p_count, SpvReflectDescriptorSet** pp_sets) const ;
|
||||
SpvReflectResult EnumerateInterfaceVariables(uint32_t* p_count, SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateEntryPointInterfaceVariables(const char* entry_point, uint32_t* p_count, SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateInputVariables(uint32_t* p_count,SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateEntryPointInputVariables(const char* entry_point, uint32_t* p_count,SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateEntryPointInputVariables(const char* entry_point, uint32_t* p_count, SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateOutputVariables(uint32_t* p_count,SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateEntryPointOutputVariables(const char* entry_point, uint32_t* p_count,SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumerateEntryPointOutputVariables(const char* entry_point, uint32_t* p_count, SpvReflectInterfaceVariable** pp_variables) const;
|
||||
SpvReflectResult EnumeratePushConstantBlocks(uint32_t* p_count, SpvReflectBlockVariable** pp_blocks) const;
|
||||
SpvReflectResult EnumerateEntryPointPushConstantBlocks(const char* entry_point, uint32_t* p_count, SpvReflectBlockVariable** pp_blocks) const;
|
||||
SPV_REFLECT_DEPRECATED("Renamed to EnumeratePushConstantBlocks")
|
||||
|
@ -1360,6 +1449,11 @@ public:
|
|||
SpvReflectResult ChangeInputVariableLocation(const SpvReflectInterfaceVariable* p_input_variable, uint32_t new_location);
|
||||
SpvReflectResult ChangeOutputVariableLocation(const SpvReflectInterfaceVariable* p_output_variable, uint32_t new_location);
|
||||
|
||||
private:
|
||||
// Make noncopyable
|
||||
ShaderModule(const ShaderModule&);
|
||||
ShaderModule& operator=(const ShaderModule&);
|
||||
|
||||
private:
|
||||
mutable SpvReflectResult m_result = SPV_REFLECT_RESULT_NOT_READY;
|
||||
SpvReflectShaderModule m_module = {};
|
||||
|
@ -1591,6 +1685,48 @@ inline SpvReflectResult ShaderModule::EnumerateEntryPointDescriptorSets(
|
|||
}
|
||||
|
||||
|
||||
/*! @fn EnumerateInterfaceVariables
|
||||
|
||||
@param count
|
||||
@param pp_variables
|
||||
@return
|
||||
|
||||
*/
|
||||
inline SpvReflectResult ShaderModule::EnumerateInterfaceVariables(
|
||||
uint32_t* p_count,
|
||||
SpvReflectInterfaceVariable** pp_variables
|
||||
) const
|
||||
{
|
||||
m_result = spvReflectEnumerateInterfaceVariables(
|
||||
&m_module,
|
||||
p_count,
|
||||
pp_variables);
|
||||
return m_result;
|
||||
}
|
||||
|
||||
/*! @fn EnumerateEntryPointInterfaceVariables
|
||||
|
||||
@param entry_point
|
||||
@param count
|
||||
@param pp_variables
|
||||
@return
|
||||
|
||||
*/
|
||||
inline SpvReflectResult ShaderModule::EnumerateEntryPointInterfaceVariables(
|
||||
const char* entry_point,
|
||||
uint32_t* p_count,
|
||||
SpvReflectInterfaceVariable** pp_variables
|
||||
) const
|
||||
{
|
||||
m_result = spvReflectEnumerateEntryPointInterfaceVariables(
|
||||
&m_module,
|
||||
entry_point,
|
||||
p_count,
|
||||
pp_variables);
|
||||
return m_result;
|
||||
}
|
||||
|
||||
|
||||
/*! @fn EnumerateInputVariables
|
||||
|
||||
@param count
|
||||
|
|
Loading…
Reference in New Issue