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

Unified Diff: gpu/command_buffer/client/gles2_implementation.cc

Issue 2576273002: Allow GL_{DRAW,READ}_FRAMEBUFFER on OpenGL ES3 without CHROMIUM_framebuffer_multisample (Closed)
Patch Set: Created 4 years 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/client/gles2_implementation.cc
diff --git a/gpu/command_buffer/client/gles2_implementation.cc b/gpu/command_buffer/client/gles2_implementation.cc
index bce6e0048711e3afff4e16b36eaedd7817065fc4..86abfabd00876bc5243f996c7ab67ac4305d4f24 100644
--- a/gpu/command_buffer/client/gles2_implementation.cc
+++ b/gpu/command_buffer/client/gles2_implementation.cc
@@ -836,7 +836,8 @@ bool GLES2Implementation::GetHelper(GLenum pname, GLint* params) {
*params = bound_pixel_unpack_transfer_buffer_id_;
return true;
case GL_READ_FRAMEBUFFER_BINDING:
- if (IsChromiumFramebufferMultisampleAvailable()) {
+ if (capabilities_.major_version >= 3 ||
+ IsChromiumFramebufferMultisampleAvailable()) {
*params = bound_read_framebuffer_;
return true;
}
@@ -4359,20 +4360,16 @@ void GLES2Implementation::BindFramebufferHelper(
}
break;
case GL_READ_FRAMEBUFFER:
- if (!IsChromiumFramebufferMultisampleAvailable()) {
- SetGLErrorInvalidEnum("glBindFramebuffer", target, "target");
- return;
- }
+ DCHECK(capabilities_.major_version >= 3 ||
+ IsChromiumFramebufferMultisampleAvailable());
if (bound_read_framebuffer_ != framebuffer) {
bound_read_framebuffer_ = framebuffer;
changed = true;
}
break;
case GL_DRAW_FRAMEBUFFER:
- if (!IsChromiumFramebufferMultisampleAvailable()) {
- SetGLErrorInvalidEnum("glBindFramebuffer", target, "target");
- return;
- }
+ DCHECK(capabilities_.major_version >= 3 ||
+ IsChromiumFramebufferMultisampleAvailable());
if (bound_framebuffer_ != framebuffer) {
bound_framebuffer_ = framebuffer;
changed = true;
« 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