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

Unified Diff: content/common/gpu/client/gl_helper.cc

Issue 10827310: Fix a misuse of framebuffer target in GLHelper (2) (Closed) Base URL: https://git.chromium.org/git/chromium/src@git-svn
Patch Set: Fixes, part 2 Created 8 years, 4 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 | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/common/gpu/client/gl_helper.cc
diff --git a/content/common/gpu/client/gl_helper.cc b/content/common/gpu/client/gl_helper.cc
index 0d594ece3e321c8cefd91b87dc452e5c3661c40c..627826988eb0ef90653eaaab0997d8cee6278e77 100644
--- a/content/common/gpu/client/gl_helper.cc
+++ b/content/common/gpu/client/gl_helper.cc
@@ -412,7 +412,7 @@ WebGLId GLHelper::CopyTextureToImpl::ScaleTexture(
WebGLId dst_texture = context_->createTexture();
{
ScopedFramebuffer dst_framebuffer(context_, context_->createFramebuffer());
- ScopedFramebufferBinder<GL_DRAW_FRAMEBUFFER> framebuffer_binder(
+ ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(
context_, dst_framebuffer);
{
ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(
@@ -426,7 +426,7 @@ WebGLId GLHelper::CopyTextureToImpl::ScaleTexture(
GL_RGBA,
GL_UNSIGNED_BYTE,
NULL);
- context_->framebufferTexture2D(GL_DRAW_FRAMEBUFFER,
+ context_->framebufferTexture2D(GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
dst_texture,
@@ -547,11 +547,11 @@ void GLHelper::CopyTextureToImpl::ReadBackFramebuffer(
size = request->size;
{
ScopedFlush flush(context);
- ScopedFramebufferBinder<GL_READ_FRAMEBUFFER> framebuffer_binder(
+ ScopedFramebufferBinder<GL_FRAMEBUFFER> framebuffer_binder(
context, dst_framebuffer);
ScopedTextureBinder<GL_TEXTURE_2D> texture_binder(
context, request->texture);
- context->framebufferTexture2D(GL_READ_FRAMEBUFFER,
+ context->framebufferTexture2D(GL_FRAMEBUFFER,
GL_COLOR_ATTACHMENT0,
GL_TEXTURE_2D,
request->texture,
« no previous file with comments | « no previous file | gpu/command_buffer/build_gles2_cmd_buffer.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698