Skip to content

S
swiftshader
Commit a00fa437 by Nicolas Capens Committed by Nicolas Capens
Options

Don't use 2D coordinates for 1D sampling

1D images were being treated as 2D ones with the second coordinate set to 0.0. It required other workarounds like moving the array layer coordinate and providing an addressing mode for the second coordinate. These have been removed, and the texel address calculation now ignores the second coordinate for 1D images. Note this doesn't specialize filtering for the 1D case yet, so the weights for filtering in the v-direction are explicitly zeroed out. Fixes: b/162858741 Bug: b/134669567 Change-Id: I4684ee0337ac500860e9939087045a953bad813a Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/47428 Presubmit-Ready: Nicolas Capens <nicolascapens@google.com> Tested-by: 's avatarNicolas Capens <nicolascapens@google.com> Reviewed-by: 's avatarChris Forbes <chrisforbes@google.com> Reviewed-by: 's avatarAlexis Hétu <sugoi@google.com> Kokoro-Result: kokoro <noreply+kokoro@google.com>
parent 73c24e4d
Showing with 43 additions and 53 deletions
src/Pipeline/SamplerCore.cpp
...@@ -38,15 +38,10 @@ Vector4f SamplerCore::sampleTexture(Pointer<Byte> &texture, Float4 uvwa[4], Floa ...@@ -38,15 +38,10 @@ Vector4f SamplerCore::sampleTexture(Pointer<Byte> &texture, Float4 uvwa[4], Floa
Float4 a; // Array layer coordinate Float4 a; // Array layer coordinate
switch(state.textureType) switch(state.textureType)
{ {
case VK_IMAGE_VIEW_TYPE_1D_ARRAY: // Treated as 2D array case VK_IMAGE_VIEW_TYPE_1D_ARRAY: a = uvwa[1]; break;
case VK_IMAGE_VIEW_TYPE_2D_ARRAY: case VK_IMAGE_VIEW_TYPE_2D_ARRAY: a = uvwa[2]; break;
a = uvwa[2]; case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY: a = uvwa[3]; break;
break; default: break;
case VK_IMAGE_VIEW_TYPE_CUBE_ARRAY:
a = uvwa[3];
break;
default:
break;
} }
Float lod; Float lod;
...@@ -1388,21 +1383,30 @@ Short4 SamplerCore::applyOffset(Short4 &uvw, Int4 &offset, const Int4 &whd, Addr ...@@ -1388,21 +1383,30 @@ Short4 SamplerCore::applyOffset(Short4 &uvw, Int4 &offset, const Int4 &whd, Addr
void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4 wwww, const Short4 &layerIndex, Vector4i &offset, const Int4 &sample, const Pointer<Byte> &mipmap, SamplerFunction function) void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4 wwww, const Short4 &layerIndex, Vector4i &offset, const Int4 &sample, const Pointer<Byte> &mipmap, SamplerFunction function)
{ {
uuuu = MulHigh(As<UShort4>(uuuu), UShort4(*Pointer<Int4>(mipmap + OFFSET(Mipmap, width)))); uuuu = MulHigh(As<UShort4>(uuuu), UShort4(*Pointer<Int4>(mipmap + OFFSET(Mipmap, width))));
vvvv = MulHigh(As<UShort4>(vvvv), UShort4(*Pointer<Int4>(mipmap + OFFSET(Mipmap, height))));
if(function.offset) if(function.offset)
{ {
uuuu = applyOffset(uuuu, offset.x, *Pointer<Int4>(mipmap + OFFSET(Mipmap, width)), state.addressingModeU); uuuu = applyOffset(uuuu, offset.x, *Pointer<Int4>(mipmap + OFFSET(Mipmap, width)), state.addressingModeU);
vvvv = applyOffset(vvvv, offset.y, *Pointer<Int4>(mipmap + OFFSET(Mipmap, height)), state.addressingModeV);
} }
Short4 uuu2 = uuuu; UInt4 indices = Int4(uuuu);
uuuu = As<Short4>(UnpackLow(uuuu, vvvv));
uuu2 = As<Short4>(UnpackHigh(uuu2, vvvv)); if(state.addressingModeV != ADDRESSING_UNUSED)
uuuu = As<Short4>(MulAdd(uuuu, *Pointer<Short4>(mipmap + OFFSET(Mipmap, onePitchP)))); {
uuu2 = As<Short4>(MulAdd(uuu2, *Pointer<Short4>(mipmap + OFFSET(Mipmap, onePitchP)))); vvvv = MulHigh(As<UShort4>(vvvv), UShort4(*Pointer<Int4>(mipmap + OFFSET(Mipmap, height))));
if(function.offset)
{
vvvv = applyOffset(vvvv, offset.y, *Pointer<Int4>(mipmap + OFFSET(Mipmap, height)), state.addressingModeV);
}
Short4 uv0uv1 = As<Short4>(UnpackLow(uuuu, vvvv));
Short4 uv2uv3 = As<Short4>(UnpackHigh(uuuu, vvvv));
Int2 i01 = MulAdd(uv0uv1, *Pointer<Short4>(mipmap + OFFSET(Mipmap, onePitchP)));
Int2 i23 = MulAdd(uv2uv3, *Pointer<Short4>(mipmap + OFFSET(Mipmap, onePitchP)));
UInt4 uv(As<UInt2>(uuuu), As<UInt2>(uuu2)); indices = UInt4(As<UInt2>(i01), As<UInt2>(i23));
}
if(state.textureType == VK_IMAGE_VIEW_TYPE_3D) if(state.textureType == VK_IMAGE_VIEW_TYPE_3D)
{ {
...@@ -1413,7 +1417,7 @@ void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4 ...@@ -1413,7 +1417,7 @@ void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4
wwww = applyOffset(wwww, offset.z, *Pointer<Int4>(mipmap + OFFSET(Mipmap, depth)), state.addressingModeW); wwww = applyOffset(wwww, offset.z, *Pointer<Int4>(mipmap + OFFSET(Mipmap, depth)), state.addressingModeW);
} }
uv += As<UInt4>(Int4(As<UShort4>(wwww))) * *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sliceP)); indices += As<UInt4>(Int4(As<UShort4>(wwww))) * *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sliceP));
} }
if(state.isArrayed()) if(state.isArrayed())
...@@ -1427,25 +1431,30 @@ void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4 ...@@ -1427,25 +1431,30 @@ void SamplerCore::computeIndices(UInt index[4], Short4 uuuu, Short4 vvvv, Short4
UInt4 layerOffset = As<UInt4>(layer) * *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sliceP)); UInt4 layerOffset = As<UInt4>(layer) * *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sliceP));
uv += layerOffset; indices += layerOffset;
} }
if(function.sample) if(function.sample)
{ {
UInt4 sampleOffset = Min(As<UInt4>(sample), *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sampleMax), 16)) * UInt4 sampleOffset = Min(As<UInt4>(sample), *Pointer<UInt4>(mipmap + OFFSET(Mipmap, sampleMax), 16)) *
*Pointer<UInt4>(mipmap + OFFSET(Mipmap, samplePitchP), 16); *Pointer<UInt4>(mipmap + OFFSET(Mipmap, samplePitchP), 16);
uv += sampleOffset; indices += sampleOffset;
} }
index[0] = Extract(As<Int4>(uv), 0); index[0] = Extract(indices, 0);
index[1] = Extract(As<Int4>(uv), 1); index[1] = Extract(indices, 1);
index[2] = Extract(As<Int4>(uv), 2); index[2] = Extract(indices, 2);
index[3] = Extract(As<Int4>(uv), 3); index[3] = Extract(indices, 3);
} }
void SamplerCore::computeIndices(UInt index[4], Int4 uuuu, Int4 vvvv, Int4 wwww, const Int4 &sample, Int4 valid, const Pointer<Byte> &mipmap, SamplerFunction function) void SamplerCore::computeIndices(UInt index[4], Int4 uuuu, Int4 vvvv, Int4 wwww, const Int4 &sample, Int4 valid, const Pointer<Byte> &mipmap, SamplerFunction function)
{ {
UInt4 indices = uuuu + vvvv; UInt4 indices = uuuu;
if(state.addressingModeV != ADDRESSING_UNUSED)
{
indices += As<UInt4>(vvvv);
}
if(state.addressingModeW != ADDRESSING_UNUSED || state.isArrayed()) if(state.addressingModeW != ADDRESSING_UNUSED || state.isArrayed())
{ {
...@@ -2192,7 +2201,7 @@ Short4 SamplerCore::address(const Float4 &uw, AddressingMode addressingMode, Poi ...@@ -2192,7 +2201,7 @@ Short4 SamplerCore::address(const Float4 &uw, AddressingMode addressingMode, Poi
{ {
if(addressingMode == ADDRESSING_UNUSED) if(addressingMode == ADDRESSING_UNUSED)
{ {
return Short4(); return Short4(0); // TODO(b/134669567): Optimize for 1D filtering
} }
else if(addressingMode == ADDRESSING_CLAMP || addressingMode == ADDRESSING_BORDER) else if(addressingMode == ADDRESSING_CLAMP || addressingMode == ADDRESSING_BORDER)
{ {
...@@ -2256,6 +2265,7 @@ void SamplerCore::address(const Float4 &uvw, Int4 &xyz0, Int4 &xyz1, Float4 &f, ...@@ -2256,6 +2265,7 @@ void SamplerCore::address(const Float4 &uvw, Int4 &xyz0, Int4 &xyz1, Float4 &f,
{ {
if(addressingMode == ADDRESSING_UNUSED) if(addressingMode == ADDRESSING_UNUSED)
{ {
f = Float4(0.0f); // TODO(b/134669567): Optimize for 1D filtering
return; return;
} }
...@@ -2301,8 +2311,8 @@ void SamplerCore::address(const Float4 &uvw, Int4 &xyz0, Int4 &xyz1, Float4 &f, ...@@ -2301,8 +2311,8 @@ void SamplerCore::address(const Float4 &uvw, Int4 &xyz0, Int4 &xyz1, Float4 &f,
// Don't map to a valid range here. // Don't map to a valid range here.
break; break;
default: default:
// If unnormalizedCoordinates is VK_TRUE, addressModeU and addressModeV must each be // "If unnormalizedCoordinates is VK_TRUE, addressModeU and addressModeV must each be
// either VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE or VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER // either VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_EDGE or VK_SAMPLER_ADDRESS_MODE_CLAMP_TO_BORDER"
UNREACHABLE("addressingMode %d", int(addressingMode)); UNREACHABLE("addressingMode %d", int(addressingMode));
break; break;
} }
...@@ -2541,13 +2551,6 @@ int SamplerCore::textureComponentCount() const ...@@ -2541,13 +2551,6 @@ int SamplerCore::textureComponentCount() const
return state.textureFormat.componentCount(); return state.textureFormat.componentCount();
} }
bool SamplerCore::hasThirdCoordinate() const
{
return (state.textureType == VK_IMAGE_VIEW_TYPE_3D) ||
(state.textureType == VK_IMAGE_VIEW_TYPE_2D_ARRAY) ||
(state.textureType == VK_IMAGE_VIEW_TYPE_1D_ARRAY); // Treated as 2D texture with second coordinate 0. TODO(b/134669567)
}
bool SamplerCore::has16bitPackedTextureFormat() const bool SamplerCore::has16bitPackedTextureFormat() const
{ {
return state.textureFormat.has16bitPackedTextureFormat(); return state.textureFormat.has16bitPackedTextureFormat();
......
src/Pipeline/SamplerCore.hpp
...@@ -100,7 +100,6 @@ private: ...@@ -100,7 +100,6 @@ private:
bool hasUnnormalizedIntegerTexture() const; bool hasUnnormalizedIntegerTexture() const;
bool hasUnsignedTextureComponent(int component) const; bool hasUnsignedTextureComponent(int component) const;
int textureComponentCount() const; int textureComponentCount() const;
bool hasThirdCoordinate() const;
bool has16bitPackedTextureFormat() const; bool has16bitPackedTextureFormat() const;
bool has8bitTextureComponents() const; bool has8bitTextureComponents() const;
bool has16bitTextureComponents() const; bool has16bitTextureComponents() const;
......
src/Pipeline/SpirvShaderSampling.cpp
...@@ -124,18 +124,6 @@ std::shared_ptr<rr::Routine> SpirvShader::emitSamplerRoutine(ImageInstruction in ...@@ -124,18 +124,6 @@ std::shared_ptr<rr::Routine> SpirvShader::emitSamplerRoutine(ImageInstruction in
i++; i++;
} }
// TODO(b/134669567): Currently 1D textures are treated as 2D by setting the second coordinate to 0.
// Implement optimized 1D sampling.
if(samplerState.textureType == VK_IMAGE_VIEW_TYPE_1D)
{
uvwa[1] = SIMD::Float(0);
}
else if(samplerState.textureType == VK_IMAGE_VIEW_TYPE_1D_ARRAY)
{
uvwa[1] = SIMD::Float(0);
uvwa[2] = in[1]; // Move 1D layer coordinate to 2D layer coordinate index.
}
if(instruction.samplerMethod == Lod || instruction.samplerMethod == Bias || instruction.samplerMethod == Fetch) if(instruction.samplerMethod == Lod || instruction.samplerMethod == Bias || instruction.samplerMethod == Fetch)
{ {
lodOrBias = in[i]; lodOrBias = in[i];
...@@ -289,13 +277,13 @@ sw::AddressingMode SpirvShader::convertAddressingMode(int coordinateIndex, const ...@@ -289,13 +277,13 @@ sw::AddressingMode SpirvShader::convertAddressingMode(int coordinateIndex, const
{ {
switch(imageViewType) switch(imageViewType)
{ {
case VK_IMAGE_VIEW_TYPE_1D: // Treated as 2D texture with second coordinate 0. TODO(b/134669567) case VK_IMAGE_VIEW_TYPE_1D:
case VK_IMAGE_VIEW_TYPE_1D_ARRAY: case VK_IMAGE_VIEW_TYPE_1D_ARRAY:
if(coordinateIndex == 1) if(coordinateIndex >= 1)
{ {
return ADDRESSING_WRAP; return ADDRESSING_UNUSED;
} }
// Fall through to 2D case: break;
case VK_IMAGE_VIEW_TYPE_2D: case VK_IMAGE_VIEW_TYPE_2D:
case VK_IMAGE_VIEW_TYPE_2D_ARRAY: case VK_IMAGE_VIEW_TYPE_2D_ARRAY:
if(coordinateIndex == 2) if(coordinateIndex == 2)
......
src/Vulkan/VkDescriptorSetLayout.cpp
...@@ -311,7 +311,7 @@ void DescriptorSetLayout::WriteDescriptorSet(Device *device, DescriptorSet *dstS ...@@ -311,7 +311,7 @@ void DescriptorSetLayout::WriteDescriptorSet(Device *device, DescriptorSet *dstS
mipmap.pitchP.x = mipmap.pitchP.y = mipmap.pitchP.z = mipmap.pitchP.w = numElements; mipmap.pitchP.x = mipmap.pitchP.y = mipmap.pitchP.z = mipmap.pitchP.w = numElements;
mipmap.sliceP.x = mipmap.sliceP.y = mipmap.sliceP.z = mipmap.sliceP.w = 0; mipmap.sliceP.x = mipmap.sliceP.y = mipmap.sliceP.z = mipmap.sliceP.w = 0;
mipmap.onePitchP[0] = mipmap.onePitchP[2] = 1; mipmap.onePitchP[0] = mipmap.onePitchP[2] = 1;
mipmap.onePitchP[1] = mipmap.onePitchP[3] = static_cast<short>(numElements); mipmap.onePitchP[1] = mipmap.onePitchP[3] = 0;
} }
} }
else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER || else if(entry.descriptorType == VK_DESCRIPTOR_TYPE_COMBINED_IMAGE_SAMPLER ||
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment