Save binding information when caching shader

src/libANGLE/Program.cpp

@@ -659,6 +659,7 @@ void WriteShaderVar(BinaryOutputStream *stream, const sh::ShaderVariable &var)
     stream->writeIntVector(var.arraySizes);
     stream->writeInt(var.staticUse);
     stream->writeInt(var.active);
+    stream->writeInt(var.binding);
     stream->writeString(var.structName);
     stream->writeInt(var.hasParentArrayIndex() ? var.parentArrayIndex() : -1);
     ASSERT(var.fields.empty());
@@ -673,6 +674,7 @@ void LoadShaderVar(BinaryInputStream *stream, sh::ShaderVariable *var)
     stream->readIntVector<unsigned int>(&var->arraySizes);
     var->staticUse  = stream->readBool();
     var->active     = stream->readBool();
+    var->binding    = stream->readInt<int>();
     var->structName = stream->readString();
     var->setParentArrayIndex(stream->readInt<int>());
 }
@@ -1685,10 +1687,6 @@ void Program::resolveLinkImpl(const Context *context)
     // Must be called after markUnusedUniformLocations.
     postResolveLink(context);
 
-    // TODO(syoussefi): this might need to be moved to postResolveLink() so it will be called from
-    // deserialize() as well.  http://anglebug.com/3089
-    setUniformValuesFromBindingQualifiers();
-
     // Save to the program cache.
     MemoryProgramCache *cache = context->getMemoryProgramCache();
     if (cache &&
@@ -5709,6 +5707,8 @@ void Program::postResolveLink(const gl::Context *context)
     mState.updateActiveSamplers();
     mState.updateActiveImages();
 
+    setUniformValuesFromBindingQualifiers();
+
     if (context->getExtensions().multiDraw)
     {
         mState.mDrawIDLocation = getUniformLocation("gl_DrawID").value;

src/tests/deqp_support/deqp_khr_gles31_test_expectations.txt

@@ -146,17 +146,6 @@
 2703 VULKAN ANDROID : KHR-GLES31.core.arrays_of_arrays.* = SKIP
 
 // Failing on Android with SwiftShader
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2D_layout_binding_texture_ComputeShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2D_layout_binding_texture_FragmentShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2D_layout_binding_texture_VertexShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2DArray_layout_binding_texture_ComputeShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2DArray_layout_binding_texture_FragmentShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler2DArray_layout_binding_texture_VertexShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler3D_layout_binding_texture_ComputeShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler3D_layout_binding_texture_FragmentShader = FAIL
-4106 SWIFTSHADER ANDROID : KHR-GLES31.core.layout_binding.sampler3D_layout_binding_texture_VertexShader = FAIL
-
-// Failing on Android with SwiftShader
 4300 SWIFTSHADER ANDROID : KHR-GLES31.core.shader_integer_mix.mix-bvec4 = FAIL
 4300 SWIFTSHADER ANDROID : KHR-GLES31.core.shader_integer_mix.mix-ivec4 = FAIL
 4300 SWIFTSHADER ANDROID : KHR-GLES31.core.shader_integer_mix.mix-uvec4 = FAIL