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

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

Issue 2120343002: command_buffer: correctly use glGetFramebufferAttachmentParameter (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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 | « gpu/command_buffer/service/framebuffer_manager.cc ('k') | 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 a2fa8a4ce0cc9c61b801b577cec5a758ad9a360d..8d8f1438729197c863b7d10e628636af53b9bcd8 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -6067,9 +6067,11 @@ bool GLES2DecoderImpl::GetHelper(
if (framebuffer->HasAlphaMRT() &&
framebuffer->HasSameInternalFormatsMRT()) {
if (feature_info_->gl_version_info().is_desktop_core_profile) {
- glGetFramebufferAttachmentParameterivEXT(
- GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
- GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, &v);
+ if (framebuffer->HasColorAttachment(0)) {
Zhenyao Mo 2016/07/04 23:16:06 Here we have a pre-existing issue: we should query
+ glGetFramebufferAttachmentParameterivEXT(
+ GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+ GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, &v);
+ }
} else {
glGetIntegerv(GL_ALPHA_BITS, &v);
}
@@ -6087,7 +6089,7 @@ bool GLES2DecoderImpl::GetHelper(
if (feature_info_->gl_version_info().is_desktop_core_profile) {
Framebuffer* framebuffer =
GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
- if (framebuffer) {
+ if (framebuffer && framebuffer->HasDepthAttachment()) {
Zhenyao Mo 2016/07/04 23:16:06 This should be an inter if statement. Because if
glGetFramebufferAttachmentParameterivEXT(
GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, &v);
@@ -6109,7 +6111,7 @@ bool GLES2DecoderImpl::GetHelper(
if (feature_info_->gl_version_info().is_desktop_core_profile) {
Framebuffer* framebuffer =
GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
- if (framebuffer) {
+ if (framebuffer && framebuffer->HasColorAttachment(0)) {
Zhenyao Mo 2016/07/04 23:16:06 Here we should do similar things as GL_ALPHA_BITS,
GLenum framebuffer_enum = 0;
switch (pname) {
case GL_RED_BITS:
@@ -6140,7 +6142,7 @@ bool GLES2DecoderImpl::GetHelper(
if (feature_info_->gl_version_info().is_desktop_core_profile) {
Framebuffer* framebuffer =
GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER_EXT);
- if (framebuffer) {
+ if (framebuffer && framebuffer->HasStencilAttachment()) {
Zhenyao Mo 2016/07/04 23:16:06 Same here, should be an inner if statement.
glGetFramebufferAttachmentParameterivEXT(
GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT,
GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, &v);
« no previous file with comments | « gpu/command_buffer/service/framebuffer_manager.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698