Integrating github/staging through commit 5f214be

2021-04-13 17:18:57 -07:00
parent 2a9dfb7a1d
commit 8469c9ca0a
904 changed files with 9289 additions and 7157 deletions
@@ -3641,7 +3641,7 @@ case _D3DValue:                                     \
        glDrawElements(m_ePrimitiveTopologyMode, uIndexCount, m_eIndexType, pvOffset);
 #endif

-        Lumberyard::OpenGL::CheckError();
+        O3de::OpenGL::CheckError();

        END_TRACE();
    }
@@ -3662,7 +3662,7 @@ case _D3DValue:                                     \
        CRY_ASSERT(m_ePrimitiveTopologyMode != GL_NONE);
        glDrawArrays(m_ePrimitiveTopologyMode, uStartVertexLocation, uVertexCount);

-        Lumberyard::OpenGL::CheckError();
+        O3de::OpenGL::CheckError();

        END_TRACE();
    }