Support different SPIRV versions. #4254
Conversation
| { | ||
| CapabilitySet latestSpirvCapSet = CapabilitySet(CapabilityName::spirv_latest); | ||
| auto latestSpirvCapSetElements = latestSpirvCapSet.getAtomSets()->getElements<CapabilityAtom>(); | ||
| result = (CapabilityName)latestSpirvCapSetElements[latestSpirvCapSetElements.getCount() - 2]; //-1 gets shader stage |
There was a problem hiding this comment.
This is just a question.
What does "-2" do here?
Is "-1" for stage and "-2" for target?
There was a problem hiding this comment.
I believe this was done by Ariel. And you are right, -1 is stage because all stage atoms are defined after target atoms.
| switch (spirvVersion.m_major) | ||
| { | ||
| case 1: | ||
| { | ||
| switch (spirvVersion.m_minor) | ||
| { | ||
| case 0: atom = CapabilityName::spirv_1_0; break; | ||
| case 1: atom = CapabilityName::spirv_1_1; break; | ||
| case 2: atom = CapabilityName::spirv_1_2; break; | ||
| case 3: atom = CapabilityName::spirv_1_3; break; | ||
| case 4: atom = CapabilityName::spirv_1_4; break; | ||
| case 5: atom = CapabilityName::spirv_1_5; break; | ||
| case 6: atom = CapabilityName::spirv_1_6; break; | ||
| } | ||
| break; | ||
| } | ||
| } |
There was a problem hiding this comment.
You may want to add default and have assertion failure to help the case where we add more version numbers later.
| @@ -450,10 +450,10 @@ bool TEST_texture_float() | |||
| // METALLIB: call {{.*}}.sample_texture_2d_array.v4f32( | |||
| && all(Tv(1) == t2DArray.SampleLevel(samplerState, float3(u, u, 0), 0, int2(1, 1))) | |||
|
|
|||
| #ifndef EXCLUDE_DEPTH_TEXTURE // Our vulkan backend don't support SampleCmp from a rgb texture. | |||
There was a problem hiding this comment.
Metal doesn't support RGB for the depth texture either.
These tests under "SampleCmp()" use a scalar float type textures; not rgb
I am not sure why you had to disable those tests.
There was a problem hiding this comment.
It is because our test infra is creating an input texture of rgba format without the depth_sample capability flag and bind it to the pipeline. This leads to a Vulkan validation error in debug build. Until we enhance our test infra to be able to specify depth textures, we can't run the test.
There was a problem hiding this comment.
Oh, I see. I guess it would fail for Metal too if it actually ran.
|
This is intended. We no longer treat it as a terminator inst and instead just treat it as a normal operation. This will preserve the control flow after the discard operation so we generate correct code for DemoteToHelperInvocations. |
This change extends our SPIRV backend to generate SPIRV 1.3 through 1.6.
SPIRV versions can be explicitly specified via the
-profileoption.Added diagnostic message when trying to use direct spirv backend to generate spirv 1.0, 1.1 and 1.2, and directs the user to use
-emit-spirv-via-glslfor older SPIR-Vs.The main change here is :
BufferBlockinUniformstorage class when producing SPIRV 1.3, and declare them asBlockinStorageBufferstorage class when producing 1.4 and later.discarddifferently when generating spirv 1.6. We will useOpDemoteToHelperInvocationfor spirv 1.6 andOpKillfor 1.5 and earlier.Closes #4142.
Closes #3297.