Commit 5ca3e5a0 by Yuly Novikov Committed by Commit Bot

Fix ShaderStorageBlockOutputHLSL::writeEOpIndexDirectOrIndirectOutput

https://chromium-review.googlesource.com/c/1304017 removed str() wrapping values passed to TInfoSinkBase::operator<<(). This broke ANGLE roll https://chromium-review.googlesource.com/c/chromium/src/+/1309331 failing compile on linux-libfuzzer-asan-rel bot. Looks like libfuzzer compiler has a bug, not being able to find sh::BlockLayoutEncoder::BytesPerComponent. Wrapping it in str() works around this. Bug: angleproject:1951 Change-Id: I2deb573667dc1e88d352bad1933c269ec36cf398 Reviewed-on: https://chromium-review.googlesource.com/c/1309975 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org> Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
parent d60e42f8
...@@ -459,22 +459,22 @@ void ShaderStorageBlockOutputHLSL::writeEOpIndexDirectOrIndirectOutput(TInfoSink ...@@ -459,22 +459,22 @@ void ShaderStorageBlockOutputHLSL::writeEOpIndexDirectOrIndirectOutput(TInfoSink
{ {
if (mRowMajor) if (mRowMajor)
{ {
out << " + " << BlockLayoutEncoder::BytesPerComponent; out << " + " << str(BlockLayoutEncoder::BytesPerComponent);
} }
else else
{ {
out << " + " << mMatrixStride; out << " + " << str(mMatrixStride);
} }
} }
else if (node->getType().isScalar() && !type.isArray()) else if (node->getType().isScalar() && !type.isArray())
{ {
if (mRowMajor) if (mRowMajor)
{ {
out << " + " << mMatrixStride; out << " + " << str(mMatrixStride);
} }
else else
{ {
out << " + " << BlockLayoutEncoder::BytesPerComponent; out << " + " << str(BlockLayoutEncoder::BytesPerComponent);
} }
} }
......
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