Fix GL_CHROMIUM_framebuffer_multisample to accept the correct enums....

gpu/command_buffer/service/feature_info.cc

 // Copyright (c) 2010 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.
 
 #include <set>
 #include <string>
 #include "app/gfx/gl/gl_implementation.h"
 #include "gpu/command_buffer/service/feature_info.h"
 #include "gpu/command_buffer/service/gl_utils.h"
 #include "gpu/GLES2/gles2_command_buffer.h"
@@ skipping 186 matching lines @@
     AddExtensionString("GL_EXT_texture_format_BGRA8888");
     validators_.texture_internal_format.AddValue(GL_BGRA_EXT);
     validators_.texture_format.AddValue(GL_BGRA_EXT);
   }
 
   if (enable_read_format_bgra) {
     AddExtensionString("GL_EXT_read_format_bgra");
     validators_.read_pixel_format.AddValue(GL_BGRA_EXT);
   }
 
+  if (ext.Desire("GL_OES_rgb8_rgba8")) {
+    if (ext.Have("GL_OES_rgb8_rgba8") ||
+        gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL) {
+      AddExtensionString("GL_OES_rgb8_rgba8");
+      validators_.render_buffer_format.AddValue(GL_RGB8_OES);
+      validators_.render_buffer_format.AddValue(GL_RGBA8_OES);
+    }
+  }
+
   // Check if we should allow GL_OES_texture_npot
   if (ext.Desire("GL_OES_texture_npot") &&
       (ext.Have("GL_ARB_texture_non_power_of_two") ||
        ext.Have("GL_OES_texture_npot"))) {
     AddExtensionString("GL_OES_texture_npot");
     npot_ok = true;
   }
 
   // Check if we should allow GL_OES_texture_float, GL_OES_texture_half_float,
   // GL_OES_texture_float_linear, GL_OES_texture_half_float_linear
@@ skipping 49 matching lines @@
   }
 
   // Check for multisample support
   if (ext.Desire("GL_CHROMIUM_framebuffer_multisample") &&
       (ext.Have("GL_EXT_framebuffer_multisample") ||
        ext.Have("GL_ANGLE_framebuffer_multisample"))) {
     feature_flags_.chromium_framebuffer_multisample = true;
     validators_.frame_buffer_target.AddValue(GL_READ_FRAMEBUFFER_EXT);
     validators_.frame_buffer_target.AddValue(GL_DRAW_FRAMEBUFFER_EXT);
     validators_.g_l_state.AddValue(GL_READ_FRAMEBUFFER_BINDING_EXT);
-    validators_.render_buffer_parameter.AddValue(GL_MAX_SAMPLES_EXT);
+    validators_.g_l_state.AddValue(GL_MAX_SAMPLES_EXT);
+    validators_.render_buffer_parameter.AddValue(GL_RENDERBUFFER_SAMPLES_EXT);
     AddExtensionString("GL_CHROMIUM_framebuffer_multisample");
   }
 
   if (ext.HaveAndDesire("GL_OES_depth24") ||
       (gfx::GetGLImplementation() == gfx::kGLImplementationDesktopGL &&
        ext.Desire("GL_OES_depth24"))) {
     AddExtensionString("GL_OES_depth24");
     validators_.render_buffer_format.AddValue(GL_DEPTH_COMPONENT24);
   }
 
@@ skipping 20 matching lines @@
   if (extensions_.find(str) == std::string::npos) {
     extensions_ += (extensions_.empty() ? "" : " ") + str;
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu