diff options
| author |  robertphillips <robertphillips@google.com> | 2015-03-01 07:38:15 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-01 07:38:15 -0800 |
| commit | 73165bd417d6cd4b4513df54b58e23e33f151a3f (patch) | |
| tree | 570e956f01d12e2fc0e51ebb106c15a600c56a36 /src/gpu/gl/GrGLNoOpInterface.cpp | |
| parent | 3d32d50364d1b63777fbf05c3593a35601bde9e2 (diff) | |
Revert of Improve tracking of bound FBOs in GrGLGpu. (patchset #10 id:180001 of https://codereview.chromium.org/949263002/)
Reason for revert:
Experimentally reverting to see if this is the cause of the mac_chromium_rel_ng roll-blocking failures.
Original issue's description:
> Improve tracking of bound FBOs in GrGLGpu.
>
> Committed: https://skia.googlesource.com/skia/+/d2ad8eb5801e2c8c0fa544a6a776bb46eedde2a0
>
> Committed: https://skia.googlesource.com/skia/+/b2af2d8b83ca4774c3b3bb1e49bc72605faa9589
>
> Committed: https://skia.googlesource.com/skia/+/0b70b86a7e9fda52ee7ebc1b9897eeaa09b9abef
TBR=egdaniel@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/970613003
Diffstat (limited to 'src/gpu/gl/GrGLNoOpInterface.cpp')
| -rw-r--r-- | src/gpu/gl/GrGLNoOpInterface.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gpu/gl/GrGLNoOpInterface.cpp b/src/gpu/gl/GrGLNoOpInterface.cpp index 38ad65e5c1..6b8880ed81 100644 --- a/src/gpu/gl/GrGLNoOpInterface.cpp +++ b/src/gpu/gl/GrGLNoOpInterface.cpp @@ -440,8 +440,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE noOpGLBindFragDataLocationIndexed(GrGLuint program, GrGLenum GR_GL_FUNCTION_TYPE noOpGLCheckFramebufferStatus(GrGLenum target) { - GrAlwaysAssert(GR_GL_FRAMEBUFFER == target || GR_GL_READ_FRAMEBUFFER == target || - GR_GL_DRAW_FRAMEBUFFER == target); + GrAlwaysAssert(GR_GL_FRAMEBUFFER == target); return GR_GL_FRAMEBUFFER_COMPLETE; } |