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

Unified Diff: gpu/command_buffer/client/gles2_implementation_impl_autogen.h

Issue 1236053003: texture mipmap level is not zero-only in ES 3 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: code rebase Created 5 years, 1 month 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
Index: gpu/command_buffer/client/gles2_implementation_impl_autogen.h
diff --git a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
index d6cac7e5d77ccef7d2af2f79cf506c7f8fb0159c..4f818b604b0daf025dd4afdc6dc02ab20606f927 100644
--- a/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
+++ b/gpu/command_buffer/client/gles2_implementation_impl_autogen.h
@@ -715,12 +715,7 @@ void GLES2Implementation::FramebufferTexture2D(GLenum target,
<< GLES2Util::GetStringAttachment(attachment) << ", "
<< GLES2Util::GetStringTextureTarget(textarget) << ", "
<< texture << ", " << level << ")");
- if (level != 0) {
- SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2D",
- "level GL_INVALID_VALUE");
- return;
- }
- helper_->FramebufferTexture2D(target, attachment, textarget, texture);
+ helper_->FramebufferTexture2D(target, attachment, textarget, texture, level);
CheckGLError();
}
@@ -2949,18 +2944,13 @@ void GLES2Implementation::FramebufferTexture2DMultisampleEXT(GLenum target,
<< GLES2Util::GetStringAttachment(attachment) << ", "
<< GLES2Util::GetStringTextureTarget(textarget) << ", "
<< texture << ", " << level << ", " << samples << ")");
- if (level != 0) {
- SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT",
- "level GL_INVALID_VALUE");
- return;
- }
if (samples < 0) {
SetGLError(GL_INVALID_VALUE, "glFramebufferTexture2DMultisampleEXT",
"samples < 0");
return;
}
helper_->FramebufferTexture2DMultisampleEXT(target, attachment, textarget,
- texture, samples);
+ texture, level, samples);
CheckGLError();
}

Powered by Google App Engine
This is Rietveld 408576698