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

Unified Diff: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp

Issue 1929203003: Revert of Fix ReadPixels from float fbo buffer in ES2/WebGL1. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 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 | « gpu/command_buffer/tests/gl_readback_unittest.cc ('k') | ui/gl/gl_implementation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
diff --git a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
index 40b3eda9046f2b6e9f1e0fa0f2f105ef18289b39..999af825100a4abb54ef8ccb4109e5fc320d7936 100644
--- a/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
+++ b/third_party/WebKit/Source/modules/webgl/WebGLRenderingContextBase.cpp
@@ -3520,7 +3520,7 @@
}
return true;
case GL_FLOAT:
- if (extensionEnabled(OESTextureFloatName) || extensionEnabled(OESTextureHalfFloatName)) {
+ if (extensionEnabled(OESTextureFloatName)) {
if (buffer && buffer->type() != DOMArrayBufferView::TypeFloat32) {
synthesizeGLError(GL_INVALID_OPERATION, "readPixels", "type FLOAT but ArrayBufferView not Float32Array");
return false;
@@ -5100,21 +5100,8 @@
ScriptValue WebGLRenderingContextBase::getIntParameter(ScriptState* scriptState, GLenum pname)
{
GLint value = 0;
- if (!isContextLost()) {
+ if (!isContextLost())
contextGL()->GetIntegerv(pname, &value);
- switch (pname) {
- case GL_IMPLEMENTATION_COLOR_READ_FORMAT:
- case GL_IMPLEMENTATION_COLOR_READ_TYPE:
- if (value == 0) {
- // This indicates read framebuffer is incomplete and an
- // INVALID_OPERATION has been generated.
- return ScriptValue::createNull(scriptState);
- }
- break;
- default:
- break;
- }
- }
return WebGLAny(scriptState, value);
}
« no previous file with comments | « gpu/command_buffer/tests/gl_readback_unittest.cc ('k') | ui/gl/gl_implementation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698