Fix type cast errors in GLES1State

Bug: angleproject:2306 Change-Id: Ic63de75d12b76395450517c99b742b8a5807cf9b Reviewed-on: https://chromium-review.googlesource.com/1179373Reviewed-by: Lingfeng Yang <lfy@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jie A Chen <jie.a.chen@intel.com>

Fix type cast errors in GLES1State
458c654b · jchen10 · Commit Bot · d731ff82 · 458c654b · 458c654b
Commit 458c654b authored Aug 17, 2018 by jchen10 Committed by Commit Bot Aug 17, 2018
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 5 deletions

GLES1State.cpp src/libANGLE/GLES1State.cpp +4 -4

GLES1State.h src/libANGLE/GLES1State.h +1 -1

No files found.
--- a/src/libANGLE/GLES1State.cpp
+++ b/src/libANGLE/GLES1State.cpp
@@ -206,16 +206,16 @@ MatrixType GLES1State::getMatrixMode() const
    return mMatrixMode;
 }

-int GLES1State::getCurrentMatrixStackDepth(GLenum queryType) const
+GLint GLES1State::getCurrentMatrixStackDepth(GLenum queryType) const
 {
    switch (queryType)
    {
        case GL_MODELVIEW_STACK_DEPTH:
-            return mModelviewMatrices.size();
+            return clampCast<GLint>(mModelviewMatrices.size());
        case GL_PROJECTION_STACK_DEPTH:
-            return mProjectionMatrices.size();
+            return clampCast<GLint>(mProjectionMatrices.size());
        case GL_TEXTURE_STACK_DEPTH:
-            return mTextureMatrices[mGLState->getActiveSampler()].size();
+            return clampCast<GLint>(mTextureMatrices[mGLState->getActiveSampler()].size());
        default:
            UNREACHABLE();
            return 0;

--- a/src/libANGLE/GLES1State.h
+++ b/src/libANGLE/GLES1State.h
@@ -148,7 +148,7 @@ class GLES1State final : angle::NonCopyable
    void setMatrixMode(MatrixType mode);
    MatrixType getMatrixMode() const;

-    int getCurrentMatrixStackDepth(GLenum param) const;
+    GLint getCurrentMatrixStackDepth(GLenum param) const;

    void pushMatrix();
    void popMatrix();