Fix some missing UBO qualifier link validation errors.

src/compiler/OutputHLSL.cpp

@@ -566,6 +566,12 @@ void OutputHLSL::header()
 
         BlockLayoutType blockLayoutType = convertBlockLayoutType(interfaceBlock.blockStorage());
         setBlockLayout(&activeBlock, blockLayoutType);
+
+        if (interfaceBlock.matrixPacking() == EmpRowMajor)
+        {
+            activeBlock.isRowMajorLayout = true;
+        }
+
         mActiveInterfaceBlocks.push_back(activeBlock);
 
         if (interfaceBlock.hasInstanceName())

src/compiler/Uniform.cpp

@@ -50,7 +50,8 @@ InterfaceBlock::InterfaceBlock(const char *name, unsigned int arraySize, unsigne
     : name(name),
       arraySize(arraySize),
       layout(BLOCKLAYOUT_SHARED),
-      registerIndex(registerIndex)
+      registerIndex(registerIndex),
+      isRowMajorLayout(false)
 {
 }
 

src/compiler/Uniform.h

@@ -79,6 +79,7 @@ struct InterfaceBlock
     size_t dataSize;
     std::vector<BlockMemberInfo> blockInfo;
     BlockLayoutType layout;
+    bool isRowMajorLayout;
 
     unsigned int registerIndex;
 };

src/libGLESv2/ProgramBinary.cpp

@@ -2459,6 +2459,12 @@ bool ProgramBinary::areMatchingInterfaceBlocks(InfoLog &infoLog, const sh::Inter
         return false;
     }
 
+    if (vertexInterfaceBlock.layout != fragmentInterfaceBlock.layout || vertexInterfaceBlock.isRowMajorLayout != fragmentInterfaceBlock.isRowMajorLayout)
+    {
+        infoLog.append("Layout qualifiers differ for interface block '%s' between vertex and fragment shaders", blockName);
+        return false;
+    }
+
     const unsigned int numBlockMembers = vertexInterfaceBlock.activeUniforms.size();
     for (unsigned int blockMemberIndex = 0; blockMemberIndex < numBlockMembers; blockMemberIndex++)
     {