Commit fe22e23a by Luc Ferron Committed by Commit Bot

Vulkan: Use SH_INITIALIZE_UNINITIALIZED_LOCALS in ShaderVk

Re-enable the flaky test InitUninitializedStructContainingArrays that was failing because of this option missing. Bug: angleproject:2460 Change-Id: Icf794a5fdca48619756d575faa4cb04f0323712e Reviewed-on: https://chromium-review.googlesource.com/1014271 Commit-Queue: Luc Ferron <lucferron@chromium.org> Reviewed-by: 's avatarJamie Madill <jmadill@chromium.org> Reviewed-by: 's avatarCorentin Wallez <cwallez@chromium.org>
parent 0986f1cc
...@@ -26,7 +26,7 @@ ShCompileOptions ShaderVk::prepareSourceAndReturnOptions(std::stringstream *sour ...@@ -26,7 +26,7 @@ ShCompileOptions ShaderVk::prepareSourceAndReturnOptions(std::stringstream *sour
std::string *sourcePath) std::string *sourcePath)
{ {
*sourceStream << mData.getSource(); *sourceStream << mData.getSource();
return 0; return SH_INITIALIZE_UNINITIALIZED_LOCALS;
} }
bool ShaderVk::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog) bool ShaderVk::postTranslateCompile(gl::Compiler *compiler, std::string *infoLog)
......
...@@ -2692,10 +2692,6 @@ TEST_P(GLSLTest_ES3, InitUninitializedLocals) ...@@ -2692,10 +2692,6 @@ TEST_P(GLSLTest_ES3, InitUninitializedLocals)
// specifically tests with two different struct variables declared in the same block. // specifically tests with two different struct variables declared in the same block.
TEST_P(GLSLTest, InitUninitializedStructContainingArrays) TEST_P(GLSLTest, InitUninitializedStructContainingArrays)
{ {
// TODO(lucferron): Root cause and fix it. Its also flaky sometimes.
// http://anglebug.com/2460
ANGLE_SKIP_TEST_IF(IsVulkan());
// Test skipped on Android GLES because local variable initialization is disabled. // Test skipped on Android GLES because local variable initialization is disabled.
// http://anglebug.com/2046 // http://anglebug.com/2046
ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES()); ANGLE_SKIP_TEST_IF(IsAndroid() && IsOpenGLES());
......
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