Initialize currentValueAttrib->binding in updateCurrentValueAttribs

src/libANGLE/renderer/d3d/VertexDataManager.cpp

@@ -293,6 +293,7 @@ gl::Error VertexDataManager::prepareVertexData(const gl::State &state,
 // static
 void VertexDataManager::StoreDirectAttrib(TranslatedAttribute *directAttrib)
 {
+    ASSERT(directAttrib->attribute && directAttrib->binding);
     const auto &attrib  = *directAttrib->attribute;
     const auto &binding = *directAttrib->binding;
 
@@ -314,6 +315,7 @@ void VertexDataManager::StoreDirectAttrib(TranslatedAttribute *directAttrib)
 // static
 gl::Error VertexDataManager::StoreStaticAttrib(TranslatedAttribute *translated)
 {
+    ASSERT(translated->attribute && translated->binding);
     const auto &attrib  = *translated->attribute;
     const auto &binding = *translated->binding;
 
@@ -424,7 +426,9 @@ void VertexDataManager::PromoteDynamicAttribs(
     for (auto attribIndex : dynamicAttribsMask)
     {
         const auto &dynamicAttrib = translatedAttribs[attribIndex];
+        ASSERT(dynamicAttrib.attribute && dynamicAttrib.binding);
         const auto &binding       = *dynamicAttrib.binding;
+
         gl::Buffer *buffer        = binding.buffer.get();
         if (buffer)
         {
@@ -439,8 +443,10 @@ gl::Error VertexDataManager::reserveSpaceForAttrib(const TranslatedAttribute &tr
                                                    GLsizei count,
                                                    GLsizei instances) const
 {
+    ASSERT(translatedAttrib.attribute && translatedAttrib.binding);
     const auto &attrib  = *translatedAttrib.attribute;
     const auto &binding = *translatedAttrib.binding;
+
     ASSERT(!DirectStoragePossible(attrib, binding));
 
     gl::Buffer *buffer   = binding.buffer.get();
@@ -461,6 +467,7 @@ gl::Error VertexDataManager::storeDynamicAttrib(TranslatedAttribute *translated,
                                                 GLsizei count,
                                                 GLsizei instances)
 {
+    ASSERT(translated->attribute && translated->binding);
     const auto &attrib  = *translated->attribute;
     const auto &binding = *translated->binding;
 
@@ -523,6 +530,7 @@ gl::Error VertexDataManager::storeCurrentValue(const gl::VertexAttribCurrentValu
 
     if (cachedState->data != currentValue)
     {
+        ASSERT(translated->attribute && translated->binding);
         const auto &attrib  = *translated->attribute;
         const auto &binding = *translated->binding;
 

src/libANGLE/renderer/d3d/d3d11/StateManager11.cpp

@@ -1102,6 +1102,7 @@ gl::Error StateManager11::updateCurrentValueAttribs(const gl::State &state,
     const auto &activeAttribsMask  = state.getProgram()->getActiveAttribLocationsMask();
     const auto &dirtyActiveAttribs = (activeAttribsMask & mDirtyCurrentValueAttribs);
     const auto &vertexAttributes   = state.getVertexArray()->getVertexAttributes();
+    const auto &vertexBindings     = state.getVertexArray()->getVertexBindings();
 
     for (auto attribIndex : dirtyActiveAttribs)
     {
@@ -1110,10 +1111,12 @@ gl::Error StateManager11::updateCurrentValueAttribs(const gl::State &state,
 
         mDirtyCurrentValueAttribs.reset(attribIndex);
 
+        const auto *attrib                   = &vertexAttributes[attribIndex];
         const auto &currentValue             = state.getVertexAttribCurrentValue(attribIndex);
         auto currentValueAttrib              = &mCurrentValueAttribs[attribIndex];
         currentValueAttrib->currentValueType = currentValue.Type;
-        currentValueAttrib->attribute        = &vertexAttributes[attribIndex];
+        currentValueAttrib->attribute        = attrib;
+        currentValueAttrib->binding          = &vertexBindings[attrib->bindingIndex];
 
         ANGLE_TRY(vertexDataManager->storeCurrentValue(currentValue, currentValueAttrib,
                                                        static_cast<size_t>(attribIndex)));