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

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

Issue 2432413003: gpu, cmaa: add glApplyScreenSpaceAntialiasingCHROMIUM unittests (Closed)
Patch Set: resolve reviewer's concerns Created 4 years, 2 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/BUILD.gn ('k') | gpu/command_buffer/tests/gl_apply_screen_space_antialiasing_CHROMIUM_unittest.cc » ('j') | 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 7b7def51edd37349492a3e9cbe089be975e76bcb..7132413f7366d7c3d3dd9a0a8328b56be4f7b7d1 100644
--- a/gpu/command_buffer/service/gles2_cmd_decoder.cc
+++ b/gpu/command_buffer/service/gles2_cmd_decoder.cc
@@ -16718,6 +16718,15 @@ void GLES2DecoderImpl::DoCreateAndConsumeTextureINTERNAL(
}
void GLES2DecoderImpl::DoApplyScreenSpaceAntialiasingCHROMIUM() {
+ Framebuffer* bound_framebuffer =
+ GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER);
+ if (!bound_framebuffer) {
+ LOCAL_SET_GL_ERROR(GL_INVALID_OPERATION,
+ "glApplyScreenSpaceAntialiasingCHROMIUM",
+ "no bound framebuffer object");
+ return;
+ }
piman 2016/10/20 18:36:17 Can you update gpu/GLES2/extensions/CHROMIUM/CHROM
dshwang 2016/10/20 19:12:18 good question. https://cs.chromium.org/chromium/s
+
// Apply CMAA(Conservative Morphological Anti-Aliasing) algorithm to the
// color attachments of currently bound draw framebuffer.
// Reference GL_INTEL_framebuffer_CMAA for details.
@@ -16740,8 +16749,7 @@ void GLES2DecoderImpl::DoApplyScreenSpaceAntialiasingCHROMIUM() {
return;
}
apply_framebuffer_attachment_cmaa_intel_
- ->ApplyFramebufferAttachmentCMAAINTEL(
- this, GetFramebufferInfoForTarget(GL_DRAW_FRAMEBUFFER));
+ ->ApplyFramebufferAttachmentCMAAINTEL(this, bound_framebuffer);
}
}
« no previous file with comments | « gpu/BUILD.gn ('k') | gpu/command_buffer/tests/gl_apply_screen_space_antialiasing_CHROMIUM_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698