| 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);
|
| }
|
|
|
|
|