Capture/Replay: Use GL types for packed types.

scripts/code_generation_hashes/GL_EGL_entry_points.json

@@ -6,7 +6,7 @@
   "scripts/entry_point_packed_gl_enums.json":
     "711fe78fe4838ac5451385275605a69a",
   "scripts/generate_entry_points.py":
-    "61b57bcf1af62062abbc099c01d2fada",
+    "4f2df44653e2b16f63fca29a14311dd5",
   "scripts/gl.xml":
     "b470cb06b06cbbe7adb2c8129ec85708",
   "scripts/gl_angle_ext.xml":
@@ -88,7 +88,7 @@
   "src/libANGLE/entry_points_enum_autogen.h":
     "909cf5a69dcfd6131a45fa26e6abff47",
   "src/libANGLE/frame_capture_utils_autogen.cpp":
-    "4a8681f3059bd2766bdb64a972ff0289",
+    "2b944324c4ab2c3659addea329394119",
   "src/libANGLE/frame_capture_utils_autogen.h":
     "b878ba5c9271e1dc3f8c7feee360c2ab",
   "src/libANGLE/validationES1_autogen.h":

scripts/generate_entry_points.py

@@ -1163,10 +1163,11 @@ def write_capture_source(annotation_with_dash, annotation_no_dash, comment, capt
         out.close()
 
 
-def get_param_type_type(param_type):
+def is_packed_enum_param_type(param_type):
+    return param_type[0:2] != "GL" and "void" not in param_type
 
-    if param_type[0:2] != "GL" and "void" not in param_type:
-        param_type = "gl::" + param_type
+
+def get_gl_pointer_type(param_type):
 
     if "ConstPointerPointer" in param_type:
         return "const " + param_type.replace("ConstPointerPointer", "") + " * const *"
@@ -1183,6 +1184,27 @@ def get_param_type_type(param_type):
     return param_type
 
 
+def get_param_type_type(param_type):
+
+    if is_packed_enum_param_type(param_type):
+        param_type = "gl::" + param_type
+
+    return get_gl_pointer_type(param_type)
+
+
+def get_gl_param_type_type(param_type):
+    if not is_packed_enum_param_type(param_type):
+        return get_gl_pointer_type(param_type)
+    else:
+        base_type = param_type.replace("Pointer", "").replace("Const", "")
+        if base_type[-2:] == "ID":
+            replace_type = "GLuint"
+        else:
+            replace_type = "GLenum"
+        param_type = param_type.replace(base_type, replace_type)
+        return get_gl_pointer_type(param_type)
+
+
 def get_param_type_union_name(param_type):
     return param_type + "Val"
 
@@ -1233,7 +1255,7 @@ def write_capture_helper_header(all_param_types):
 
 def format_param_type_to_string_case(param_type):
     return template_param_type_to_string_case.format(
-        enum=param_type, type=get_param_type_type(param_type))
+        enum=param_type, type=get_gl_param_type_type(param_type))
 
 
 def write_capture_helper_source(all_param_types):

src/libANGLE/frame_capture_utils_autogen.cpp

@@ -333,23 +333,23 @@ const char *ParamTypeToString(ParamType paramType)
     switch (paramType)
     {
         case ParamType::TAlphaTestFunc:
-            return "gl::AlphaTestFunc";
+            return "GLenum";
         case ParamType::TBufferBinding:
-            return "gl::BufferBinding";
+            return "GLenum";
         case ParamType::TBufferID:
-            return "gl::BufferID";
+            return "GLuint";
         case ParamType::TBufferIDConstPointer:
-            return "const gl::BufferID *";
+            return "const GLuint *";
         case ParamType::TBufferIDPointer:
-            return "gl::BufferID *";
+            return "GLuint *";
         case ParamType::TBufferUsage:
-            return "gl::BufferUsage";
+            return "GLenum";
         case ParamType::TClientVertexArrayType:
-            return "gl::ClientVertexArrayType";
+            return "GLenum";
         case ParamType::TCullFaceMode:
-            return "gl::CullFaceMode";
+            return "GLenum";
         case ParamType::TDrawElementsType:
-            return "gl::DrawElementsType";
+            return "GLenum";
         case ParamType::TGLDEBUGPROC:
             return "GLDEBUGPROC";
         case ParamType::TGLDEBUGPROCKHR:
@@ -457,51 +457,51 @@ const char *ParamTypeToString(ParamType paramType)
         case ParamType::TGLvoidConstPointerPointer:
             return "const GLvoid * const *";
         case ParamType::TGraphicsResetStatus:
-            return "gl::GraphicsResetStatus";
+            return "GLenum";
         case ParamType::THandleType:
-            return "gl::HandleType";
+            return "GLenum";
         case ParamType::TLightParameter:
-            return "gl::LightParameter";
+            return "GLenum";
         case ParamType::TLogicalOperation:
-            return "gl::LogicalOperation";
+            return "GLenum";
         case ParamType::TMaterialParameter:
-            return "gl::MaterialParameter";
+            return "GLenum";
         case ParamType::TMatrixType:
-            return "gl::MatrixType";
+            return "GLenum";
         case ParamType::TPointParameter:
-            return "gl::PointParameter";
+            return "GLenum";
         case ParamType::TPrimitiveMode:
-            return "gl::PrimitiveMode";
+            return "GLenum";
         case ParamType::TProvokingVertexConvention:
-            return "gl::ProvokingVertexConvention";
+            return "GLenum";
         case ParamType::TQueryType:
-            return "gl::QueryType";
+            return "GLenum";
         case ParamType::TRenderbufferID:
-            return "gl::RenderbufferID";
+            return "GLuint";
         case ParamType::TRenderbufferIDConstPointer:
-            return "const gl::RenderbufferID *";
+            return "const GLuint *";
         case ParamType::TRenderbufferIDPointer:
-            return "gl::RenderbufferID *";
+            return "GLuint *";
         case ParamType::TShaderType:
-            return "gl::ShaderType";
+            return "GLenum";
         case ParamType::TShadingModel:
-            return "gl::ShadingModel";
+            return "GLenum";
         case ParamType::TTextureEnvParameter:
-            return "gl::TextureEnvParameter";
+            return "GLenum";
         case ParamType::TTextureEnvTarget:
-            return "gl::TextureEnvTarget";
+            return "GLenum";
         case ParamType::TTextureID:
-            return "gl::TextureID";
+            return "GLuint";
         case ParamType::TTextureIDConstPointer:
-            return "const gl::TextureID *";
+            return "const GLuint *";
         case ParamType::TTextureIDPointer:
-            return "gl::TextureID *";
+            return "GLuint *";
         case ParamType::TTextureTarget:
-            return "gl::TextureTarget";
+            return "GLenum";
         case ParamType::TTextureType:
-            return "gl::TextureType";
+            return "GLenum";
         case ParamType::TVertexAttribType:
-            return "gl::VertexAttribType";
+            return "GLenum";
         case ParamType::TvoidConstPointer:
             return "const void *";
         case ParamType::TvoidConstPointerPointer: