diff options
| author | Tim Foley <tfoleyNV@users.noreply.github.com> | 2017-07-14 11:31:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-14 11:31:23 -0700 |
| commit | d9366db8993c566fbb0af780c13db438dbf74022 (patch) | |
| tree | 7f8302ad4eb9558e1260ad8aed048f1292092489 /slang.h | |
| parent | 47e94a14a174ce501883c85b7c742c10b785b4f5 (diff) | |
| parent | 2bf87743ffe73f041036ae62c8bf53f09215ca53 (diff) | |
Merge pull request #89 from tfoleyNV/glpervertex-location-fix
Don't use "auto locations" mode in glslang
Diffstat (limited to 'slang.h')
| -rw-r--r-- | slang.h | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -440,6 +440,7 @@ extern "C" enum { SLANG_PARAMETER_CATEGORY_NONE, + SLANG_PARAMETER_CATEGORY_MIXED, SLANG_PARAMETER_CATEGORY_CONSTANT_BUFFER, SLANG_PARAMETER_CATEGORY_SHADER_RESOURCE, SLANG_PARAMETER_CATEGORY_UNORDERED_ACCESS, @@ -449,7 +450,10 @@ extern "C" SLANG_PARAMETER_CATEGORY_UNIFORM, SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT, SLANG_PARAMETER_CATEGORY_SPECIALIZATION_CONSTANT, - SLANG_PARAMETER_CATEGORY_MIXED, + SLANG_PARAMETER_CATEGORY_PUSH_CONSTANT_BUFFER, + + // + SLANG_PARAMETER_CATEGORY_COUNT, }; typedef SlangUInt32 SlangStage; @@ -686,6 +690,7 @@ namespace slang { // TODO: these aren't scoped... None = SLANG_PARAMETER_CATEGORY_NONE, + Mixed = SLANG_PARAMETER_CATEGORY_MIXED, ConstantBuffer = SLANG_PARAMETER_CATEGORY_CONSTANT_BUFFER, ShaderResource = SLANG_PARAMETER_CATEGORY_SHADER_RESOURCE, UnorderedAccess = SLANG_PARAMETER_CATEGORY_UNORDERED_ACCESS, @@ -695,7 +700,7 @@ namespace slang Uniform = SLANG_PARAMETER_CATEGORY_UNIFORM, DescriptorTableSlot = SLANG_PARAMETER_CATEGORY_DESCRIPTOR_TABLE_SLOT, SpecializationConstant = SLANG_PARAMETER_CATEGORY_SPECIALIZATION_CONSTANT, - Mixed = SLANG_PARAMETER_CATEGORY_MIXED, + PushConstantBuffer = SLANG_PARAMETER_CATEGORY_PUSH_CONSTANT_BUFFER, }; struct TypeLayoutReflection |