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

Unified Diff: Source/core/html/canvas/WebGLRenderingContextBase.cpp

Issue 1099853002: WebGL: add targets for WebGL 2 when check FBO targets (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/html/canvas/WebGLRenderingContextBase.cpp
diff --git a/Source/core/html/canvas/WebGLRenderingContextBase.cpp b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
index 6c7ef4a61200aa725abc1486c827a51c0fb337a0..77af9c3aa9afec5b8f13b049b4299f64fa1c0956 100644
--- a/Source/core/html/canvas/WebGLRenderingContextBase.cpp
+++ b/Source/core/html/canvas/WebGLRenderingContextBase.cpp
@@ -1369,7 +1369,7 @@ GLenum WebGLRenderingContextBase::checkFramebufferStatus(GLenum target)
{
if (isContextLost())
return GL_FRAMEBUFFER_UNSUPPORTED;
- if (target != GL_FRAMEBUFFER) {
+ if ((target != GL_FRAMEBUFFER && !isWebGL2OrHigher()) || (target != GL_READ_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER)) {
Zhenyao Mo 2015/04/22 22:39:43 This is incorrect. GL_FRAMEBUFFER is also a valid
yunchao 2015/04/23 06:46:46 Yeah. But I made a mistake by this logic.
synthesizeGLError(GL_INVALID_ENUM, "checkFramebufferStatus", "invalid target");
return 0;
}
@@ -5374,7 +5374,7 @@ void WebGLRenderingContextBase::printWarningToConsole(const String& message)
bool WebGLRenderingContextBase::validateFramebufferFuncParameters(const char* functionName, GLenum target, GLenum attachment)
{
- if (target != GL_FRAMEBUFFER) {
+ if ((target != GL_FRAMEBUFFER && !isWebGL2OrHigher()) || (target != GL_READ_FRAMEBUFFER && target != GL_DRAW_FRAMEBUFFER)) {
Zhenyao Mo 2015/04/22 22:39:43 Ditto.
yunchao 2015/04/23 06:46:46 Done.
synthesizeGLError(GL_INVALID_ENUM, functionName, "invalid target");
return false;
}
« 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