GLES1: Add MatrixType packed enum to entry points

(It's not called MatrixMode because that collides with the MatrixMode entry point name) BUG=angleproject:2306 Change-Id: I9a192701f6248f1e7d4f202c7d1ddfcdbe1b0089 Reviewed-on: https://chromium-review.googlesource.com/990585 Commit-Queue: Lingfeng Yang <lfy@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Corentin Wallez <cwallez@chromium.org>

GLES1: Add MatrixType packed enum to entry points
00af463e · Lingfeng Yang · Commit Bot · bab086a7 · 00af463e · 00af463e
Commit 00af463e authored Apr 02, 2018 by Lingfeng Yang Committed by Commit Bot Apr 04, 2018
6 changed files
--- a/scripts/entry_point_packed_gl_enums.json
+++ b/scripts/entry_point_packed_gl_enums.json
@@ -163,6 +163,9 @@
    "glMapBufferRangeEXT": {
        "target": "BufferBinding"
    },
+    "glMatrixMode": {
+        "mode": "MatrixType"
+    },
    "glTexImage2D": {
        "target": "TextureTarget"
    },

--- a/src/libANGLE/Context_gles_1_0.cpp
+++ b/src/libANGLE/Context_gles_1_0.cpp
@@ -262,7 +262,7 @@ void Context::materialxv(GLenum face, GLenum pname, const GLfixed *param)
    UNIMPLEMENTED();
 }
-void Context::matrixMode(GLenum mode)
+void Context::matrixMode(MatrixType mode)
 {
    UNIMPLEMENTED();
 }

--- a/src/libANGLE/Context_gles_1_0_autogen.h
+++ b/src/libANGLE/Context_gles_1_0_autogen.h
@@ -59,7 +59,7 @@
    void materialfv(GLenum face, GLenum pname, const GLfloat *params);                     \
    void materialx(GLenum face, GLenum pname, GLfixed param);                              \
    void materialxv(GLenum face, GLenum pname, const GLfixed *param);                      \
-    void matrixMode(GLenum mode);                                                          \
+    void matrixMode(MatrixType modePacked);                                                \
    void multMatrixf(const GLfloat *m);                                                    \
    void multMatrixx(const GLfixed *m);                                                    \
    void multiTexCoord4f(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q);       \

--- a/src/libANGLE/validationES1.cpp
+++ b/src/libANGLE/validationES1.cpp
@@ -369,7 +369,7 @@ bool ValidateMaterialxv(Context *context, GLenum face, GLenum pname, const GLfix
    return true;
 }
-bool ValidateMatrixMode(Context *context, GLenum mode)
+bool ValidateMatrixMode(Context *context, MatrixType mode)
 {
    UNIMPLEMENTED();
    return true;

--- a/src/libANGLE/validationES1.h
+++ b/src/libANGLE/validationES1.h
@@ -85,7 +85,7 @@ bool ValidateMaterialf(Context *context, GLenum face, GLenum pname, GLfloat para
 bool ValidateMaterialfv(Context *context, GLenum face, GLenum pname, const GLfloat *params);
 bool ValidateMaterialx(Context *context, GLenum face, GLenum pname, GLfixed param);
 bool ValidateMaterialxv(Context *context, GLenum face, GLenum pname, const GLfixed *param);
-bool ValidateMatrixMode(Context *context, GLenum mode);
+bool ValidateMatrixMode(Context *context, MatrixType mode);
 bool ValidateMultMatrixf(Context *context, const GLfloat *m);
 bool ValidateMultMatrixx(Context *context, const GLfixed *m);
 bool ValidateMultiTexCoord4f(Context *context,

--- a/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
+++ b/src/libGLESv2/entry_points_gles_1_0_autogen.cpp
@@ -835,11 +835,12 @@ void GL_APIENTRY MatrixMode(GLenum mode)
    Context *context = GetValidGlobalContext();
    if (context)
    {
-        context->gatherParams<EntryPoint::MatrixMode>(mode);
+        MatrixType modePacked = FromGLenum<MatrixType>(mode);
+        context->gatherParams<EntryPoint::MatrixMode>(modePacked);
-        if (context->skipValidation() || ValidateMatrixMode(context, mode))
+        if (context->skipValidation() || ValidateMatrixMode(context, modePacked))
        {
-            context->matrixMode(mode);
+            context->matrixMode(modePacked);
        }
    }
 }