D3D: Make computeOffset not use ErrorOrResult.

src/libANGLE/renderer/d3d/VertexDataManager.cpp

@@ -128,18 +128,21 @@ TranslatedAttribute::TranslatedAttribute()
 
 TranslatedAttribute::TranslatedAttribute(const TranslatedAttribute &other) = default;
 
-gl::ErrorOrResult<unsigned int> TranslatedAttribute::computeOffset(GLint startVertex) const
+gl::Error TranslatedAttribute::computeOffset(GLint startVertex, unsigned int *offsetOut) const
 {
     if (!usesFirstVertexOffset)
     {
-        return baseOffset;
+        *offsetOut = baseOffset;
+        return gl::NoError();
     }
 
-    CheckedNumeric<unsigned int> offset;
+    CheckedNumeric<unsigned int> offset(baseOffset);
+    CheckedNumeric<unsigned int> checkedStride(stride);
 
-    offset = baseOffset + stride * static_cast<unsigned int>(startVertex);
+    offset += checkedStride * static_cast<unsigned int>(startVertex);
     ANGLE_TRY_CHECKED_MATH(offset.IsValid());
-    return offset.ValueOrDie();
+    *offsetOut = offset.ValueOrDie();
+    return gl::NoError();
 }
 
 // Warning: you should ensure binding really matches attrib.bindingIndex before using this function.

src/libANGLE/renderer/d3d/VertexDataManager.h

@@ -52,7 +52,7 @@ struct TranslatedAttribute
 
     // Computes the correct offset from baseOffset, usesFirstVertexOffset, stride and startVertex.
     // Can throw an error on integer overflow.
-    gl::ErrorOrResult<unsigned int> computeOffset(GLint startVertex) const;
+    gl::Error computeOffset(GLint startVertex, unsigned int *offsetOut) const;
 
     bool active;
 

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

@@ -1270,7 +1270,7 @@ gl::Error Buffer11::EmulatedIndexedStorage::getBuffer(SourceIndexData *indexInfo
     if (!mBuffer.valid())
     {
         unsigned int offset = 0;
-        ANGLE_TRY_RESULT(attribute.computeOffset(startVertex), offset);
+        ANGLE_TRY(attribute.computeOffset(startVertex, &offset));
 
         // Expand the memory storage upon request and cache the results.
         unsigned int expandedDataSize =

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

@@ -2756,7 +2756,7 @@ gl::Error StateManager11::applyVertexBuffers(const gl::Context *context,
             }
 
             vertexStride = attrib.stride;
-            ANGLE_TRY_RESULT(attrib.computeOffset(drawCallParams.firstVertex()), vertexOffset);
+            ANGLE_TRY(attrib.computeOffset(drawCallParams.firstVertex(), &vertexOffset));
         }
 
         size_t bufferIndex = reservedBuffers + attribIndex;
@@ -2921,7 +2921,7 @@ gl::Error StateManager11::updateVertexOffsetsForPointSpritesEmulation(GLint star
         if (attrib.divisor > 0)
         {
             unsigned int offset = 0;
-            ANGLE_TRY_RESULT(attrib.computeOffset(startVertex), offset);
+            ANGLE_TRY(attrib.computeOffset(startVertex, &offset));
             offset += (attrib.stride * (emulatedInstanceId / attrib.divisor));
             if (offset != mCurrentVertexOffsets[bufferIndex])
             {

src/libANGLE/renderer/d3d/d3d9/VertexDeclarationCache.cpp

@@ -152,7 +152,7 @@ gl::Error VertexDeclarationCache::applyDeclaration(
             VertexBuffer9 *vertexBuffer = GetAs<VertexBuffer9>(attributes[i].vertexBuffer.get());
 
             unsigned int offset = 0;
-            ANGLE_TRY_RESULT(attributes[i].computeOffset(start), offset);
+            ANGLE_TRY(attributes[i].computeOffset(start, &offset));
 
             if (mAppliedVBs[stream].serial != attributes[i].serial ||
                 mAppliedVBs[stream].stride != attributes[i].stride ||