Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Support for CapabilityShaderViewportIndex and CapabilityShaderLayer #2432

Merged
merged 4 commits into from
Nov 2, 2020
Merged

Support for CapabilityShaderViewportIndex and CapabilityShaderLayer #2432

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
670536b
When targeting SPIR-V 1.5, using gl_ViewportIndex will emit OpCapabil…
JustSid Oct 22, 2020
dccca82
When using one of the viewport/layer arrays extensions, fallback to O…
JustSid Oct 22, 2020
f5cff7e
Revert "When using one of the viewport/layer arrays extensions, fallb…
JustSid Oct 28, 2020
9e9ac05
Using gl_Layer and gl_ViewportIndex outside of the geometry shader st…
JustSid Oct 29, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Revert "When using one of the viewport/layer arrays extensions, fallb… 
…ack to OpCapability ShaderViewportIndexLayerEXT, even when targeting SPIR-V 1.5"

This reverts commit dccca82.
  • Loading branch information
@JustSid
JustSid committed Oct 28, 2020
commit f5cff7ef4e2851ced69f9dd4589936a09e2c7187
6 changes: 2 additions & 4 deletions SPIRV/GlslangToSpv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -714,8 +714,7 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
glslangIntermediate->getStage() == EShLangTessControl ||
glslangIntermediate->getStage() == EShLangTessEvaluation) {

if (builder.getSpvVersion() < spv::Spv_1_5 ||
builder.hasAnySourceExtension(glslang::viewportEXTs, glslang::Num_viewportEXTs)) {
if (builder.getSpvVersion() < spv::Spv_1_5) {
builder.addIncorporatedExtension(spv::E_SPV_EXT_shader_viewport_index_layer, spv::Spv_1_5);
builder.addCapability(spv::CapabilityShaderViewportIndexLayerEXT);
}
Expand Down Expand Up @@ -744,8 +743,7 @@ spv::BuiltIn TGlslangToSpvTraverser::TranslateBuiltInDecoration(glslang::TBuiltI
glslangIntermediate->getStage() == EShLangTessControl ||
glslangIntermediate->getStage() == EShLangTessEvaluation) {

if (builder.getSpvVersion() < spv::Spv_1_5 ||
builder.hasAnySourceExtension(glslang::viewportEXTs, glslang::Num_viewportEXTs)) {
if (builder.getSpvVersion() < spv::Spv_1_5) {
builder.addIncorporatedExtension(spv::E_SPV_EXT_shader_viewport_index_layer, spv::Spv_1_5);
builder.addCapability(spv::CapabilityShaderViewportIndexLayerEXT);
} else
Expand Down
17 changes: 0 additions & 17 deletions SPIRV/SpvBuilder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,23 +80,6 @@ class Builder {

unsigned int getSpvVersion() const { return spvVersion; }

bool hasSourceExtension(const char* ext) const
{
for (auto& extension : sourceExtensions)
if (strcmp(extension, ext) == 0)
return true;

return false;
}
bool hasAnySourceExtension(const char* const exts[], int count) const
{
for (int i = 0; i < count; ++i)
if (hasSourceExtension(exts[i]))
return true;

return false;
}

void setSource(spv::SourceLanguage lang, int version)
{
source = lang;
Expand Down