Move assertion into if-block.

Since the loop always goes up to MAX_VERTEX_ATTRIBS, the ASSERTION may be triggered even though no more attributes are enabled. BUG=angle:740 Change-Id: I2bb30d7e9f426ae1a0b8250e65c1fd02107973ac Reviewed-on: https://chromium-review.googlesource.com/217027Reviewed-by: Jamie Madill <jmadill@chromium.org> Tested-by: Geoff Lang <geofflang@chromium.org>

Move assertion into if-block.
5ac5ae86 · Geoff Lang · 63d2fc7f · 5ac5ae86
Commit 5ac5ae86 authored Sep 09, 2014 by Geoff Lang
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 4 deletions

DynamicHLSL.cpp src/libGLESv2/renderer/d3d/DynamicHLSL.cpp +3 -4

No files found.
--- a/src/libGLESv2/renderer/d3d/DynamicHLSL.cpp
+++ b/src/libGLESv2/renderer/d3d/DynamicHLSL.cpp
@@ -365,13 +365,12 @@ std::string DynamicHLSL::generateVertexShaderForInputLayout(const std::string &s

    for (unsigned int attributeIndex = 0; attributeIndex < MAX_VERTEX_ATTRIBS; attributeIndex++)
    {
-        ASSERT(inputIndex < MAX_VERTEX_ATTRIBS);
-
-        const VertexFormat &vertexFormat = inputLayout[inputIndex];
        const sh::Attribute &shaderAttribute = shaderAttributes[attributeIndex];
-
        if (!shaderAttribute.name.empty())
        {
+            ASSERT(inputIndex < MAX_VERTEX_ATTRIBS);
+            const VertexFormat &vertexFormat = inputLayout[inputIndex];
+
            // HLSL code for input structure
            if (IsMatrixType(shaderAttribute.type))
            {