Fix asserts due to missing texture formats
In has16bitTextureFormat(), we were missing several formats. Also this
function was poorly named, as it made it seem like we were just
duplicating the work of the bytes() function but giving less
informations. What has16bitTextureFormat() is really checking for is if
the texture format is 16 bit Packed. So it's been renamed to
has16bitPackedTextureFormat()
Bug: b/150076646
Change-Id: I8082e8e9d3845cfa3b5c3ec4a269454457d558ce
Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/42688
Tested-by: Sean Risser <srisser@google.com>
Kokoro-Result: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nicolas Capens <nicolascapens@google.com>
diff --git a/src/Pipeline/SamplerCore.cpp b/src/Pipeline/SamplerCore.cpp
index 2bb87c1..6540c06 100644
--- a/src/Pipeline/SamplerCore.cpp
+++ b/src/Pipeline/SamplerCore.cpp
@@ -1496,7 +1496,7 @@
{
Vector4s c;
- if(has16bitTextureFormat())
+ if(has16bitPackedTextureFormat())
{
c.x = Insert(c.x, Pointer<Short>(buffer)[index[0]], 0);
c.x = Insert(c.x, Pointer<Short>(buffer)[index[1]], 1);
@@ -2534,9 +2534,9 @@
(state.textureType == VK_IMAGE_VIEW_TYPE_1D_ARRAY); // Treated as 2D texture with second coordinate 0. TODO(b/134669567)
}
-bool SamplerCore::has16bitTextureFormat() const
+bool SamplerCore::has16bitPackedTextureFormat() const
{
- return state.textureFormat.has16bitTextureFormat();
+ return state.textureFormat.has16bitPackedTextureFormat();
}
bool SamplerCore::has8bitTextureComponents() const
