Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(256)

Unified Diff: gpu/command_buffer/service/gles2_cmd_decoder.cc

Issue 1133163003: mac: Fix an error in a unit_test from linking against the 10.10 SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/command_buffer/service/gles2_cmd_decoder.cc
diff --git a/gpu/command_buffer/service/gles2_cmd_decoder.cc b/gpu/command_buffer/service/gles2_cmd_decoder.cc
index 602d2615f7291fd67118b1cd940dabe38546737f..29a21d0881c30eb28393eca4a11774977977d632 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -5986,7 +5986,11 @@ bool GLES2DecoderImpl::VerifyMultisampleRenderbufferIntegrity(
// Texture only needs to be 1x1.
glBindTexture(GL_TEXTURE_2D, validation_texture_);
- glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 1, 1, 0, GL_RGB,
+ // TODO(erikchen): When Chrome on Mac is linked against an OSX 10.9+ SDK, a
+ // multisample will fail if the color format of the source and destination
+ // do not match. Here, we assume that the source is GL_RGBA, and make the
+ // destination GL_RGBA. http://crbug.com/484203
+ glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0, GL_RGBA,
GL_UNSIGNED_BYTE, NULL);
glBindFramebufferEXT(GL_FRAMEBUFFER, validation_fbo_);
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698