Fix ReadPixels implementation specific read format/type on desktop GL.

gpu/command_buffer/service/gles2_cmd_validation_implementation_autogen.h

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // This file is auto-generated from
 // gpu/command_buffer/build_gles2_cmd_buffer.py
 // It's formatted by clang-format using chromium coding style:
 //    clang-format -i -style=chromium filename
 // DO NOT EDIT!
 
@@ skipping 518 matching lines @@
     GL_COLOR_ATTACHMENT13,
     GL_COLOR_ATTACHMENT14,
     GL_COLOR_ATTACHMENT15,
 };
 
 static const GLenum valid_read_pixel_format_table[] = {
     GL_ALPHA, GL_RGB, GL_RGBA,
 };
 
 static const GLenum valid_read_pixel_format_table_es3[] = {
-    GL_RGBA_INTEGER,
-};
-
-static const GLenum deprecated_read_pixel_format_table_es3[] = {
-    GL_ALPHA, GL_RGB,
+    GL_RED,         GL_RED_INTEGER,  GL_RG,        GL_RG_INTEGER,
+    GL_RGB_INTEGER, GL_RGBA_INTEGER, GL_LUMINANCE, GL_LUMINANCE_ALPHA,
 };
 
 static const GLenum valid_read_pixel_type_table[] = {
     GL_UNSIGNED_BYTE, GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_4_4_4_4,
     GL_UNSIGNED_SHORT_5_5_5_1,
 };
 
 static const GLenum valid_read_pixel_type_table_es3[] = {
-    GL_UNSIGNED_INT, GL_INT, GL_FLOAT, GL_UNSIGNED_INT_2_10_10_10_REV,
-};
-
-static const GLenum deprecated_read_pixel_type_table_es3[] = {
-    GL_UNSIGNED_SHORT_5_6_5, GL_UNSIGNED_SHORT_4_4_4_4,
-    GL_UNSIGNED_SHORT_5_5_5_1,
+    GL_BYTE, GL_UNSIGNED_SHORT, GL_SHORT, GL_UNSIGNED_INT,
+    GL_INT,  GL_HALF_FLOAT,     GL_FLOAT, GL_UNSIGNED_INT_2_10_10_10_REV,
 };
 
 static const GLenum valid_render_buffer_format_table[] = {
     GL_RGBA4, GL_RGB565, GL_RGB5_A1, GL_DEPTH_COMPONENT16, GL_STENCIL_INDEX8,
 };
 
 static const GLenum valid_render_buffer_format_table_es3[] = {
     GL_R8,
     GL_R8UI,
     GL_R8I,
@@ skipping 586 matching lines @@
   hint_target.AddValues(valid_hint_target_table_es3,
                         arraysize(valid_hint_target_table_es3));
   index_type.AddValues(valid_index_type_table_es3,
                        arraysize(valid_index_type_table_es3));
   pixel_store.AddValues(valid_pixel_store_table_es3,
                         arraysize(valid_pixel_store_table_es3));
   pixel_type.AddValues(valid_pixel_type_table_es3,
                        arraysize(valid_pixel_type_table_es3));
   program_parameter.AddValues(valid_program_parameter_table_es3,
                               arraysize(valid_program_parameter_table_es3));
-  read_pixel_format.RemoveValues(
-      deprecated_read_pixel_format_table_es3,
-      arraysize(deprecated_read_pixel_format_table_es3));
   read_pixel_format.AddValues(valid_read_pixel_format_table_es3,
                               arraysize(valid_read_pixel_format_table_es3));
-  read_pixel_type.RemoveValues(deprecated_read_pixel_type_table_es3,
-                               arraysize(deprecated_read_pixel_type_table_es3));
   read_pixel_type.AddValues(valid_read_pixel_type_table_es3,
                             arraysize(valid_read_pixel_type_table_es3));
   render_buffer_format.AddValues(
       valid_render_buffer_format_table_es3,
       arraysize(valid_render_buffer_format_table_es3));
   render_buffer_parameter.AddValues(
       valid_render_buffer_parameter_table_es3,
       arraysize(valid_render_buffer_parameter_table_es3));
   texture_bind_target.AddValues(valid_texture_bind_target_table_es3,
                                 arraysize(valid_texture_bind_target_table_es3));
@@ skipping 10 matching lines @@
       arraysize(valid_texture_internal_format_storage_table_es3));
   texture_parameter.AddValues(valid_texture_parameter_table_es3,
                               arraysize(valid_texture_parameter_table_es3));
   vertex_attrib_type.AddValues(valid_vertex_attrib_type_table_es3,
                                arraysize(valid_vertex_attrib_type_table_es3));
   vertex_attribute.AddValues(valid_vertex_attribute_table_es3,
                              arraysize(valid_vertex_attribute_table_es3));
 }
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GLES2_CMD_VALIDATION_IMPLEMENTATION_AUTOGEN_H_