[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
zmo at google.com
zmo at google.com
Wed Dec 22 15:29:43 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 1fab1fa476b54338c2b5ef8141e6873365bf2335
Author: zmo at google.com <zmo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Fri Nov 5 00:55:00 2010 +0000
2010-11-04 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
https://bugs.webkit.org/show_bug.cgi?id=48938
* src/WebGraphicsContext3DDefaultImpl.cpp:
(WebKit::WebGraphicsContext3DDefaultImpl::getIntegerv):
2010-11-04 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
https://bugs.webkit.org/show_bug.cgi?id=48938
* html/canvas/WebGLRenderingContext.cpp:
(WebCore::WebGLRenderingContext::initializeNewContext):
(WebCore::WebGLRenderingContext::getParameter):
(WebCore::WebGLRenderingContext::readPixels):
* html/canvas/WebGLRenderingContext.h:
* html/canvas/WebGLRenderingContext.idl:
* platform/graphics/GraphicsContext3D.h:
* platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
(WebCore::GraphicsContext3D::getIntegerv):
2010-11-04 Zhenyao Mo <zmo at google.com>
Reviewed by Kenneth Russell.
Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
https://bugs.webkit.org/show_bug.cgi?id=48938
* fast/canvas/webgl/read-pixels-pack-alignment-expected.txt:
* fast/canvas/webgl/read-pixels-pack-alignment.html:
* fast/canvas/webgl/webgl-specific-expected.txt:
* fast/canvas/webgl/webgl-specific.html: Test two enums are undefined in WebGL.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71372 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ca401ee..5f88637 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -2,6 +2,18 @@
Reviewed by Kenneth Russell.
+ Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
+ https://bugs.webkit.org/show_bug.cgi?id=48938
+
+ * fast/canvas/webgl/read-pixels-pack-alignment-expected.txt:
+ * fast/canvas/webgl/read-pixels-pack-alignment.html:
+ * fast/canvas/webgl/webgl-specific-expected.txt:
+ * fast/canvas/webgl/webgl-specific.html: Test two enums are undefined in WebGL.
+
+2010-11-04 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
TypedArray should throw exception if length not a multiple of element size
https://bugs.webkit.org/show_bug.cgi?id=45487
diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
index 45b0b9a..8e9fcc1 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment-expected.txt
@@ -3,10 +3,6 @@ Verify readPixels() works fine with various PACK_ALIGNMENT values.
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
PASS gl = initWebGL('example', 'vshader', 'fshader', [ 'pos', 'colorIn' ], [ 0, 0, 0, 1 ], 1) is non-null.
-Check supported pixel format/type besides RGBA/UNSIGNED_BYTE
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS pixelFormat == gl.RGBA && pixelType == gl.UNSIGNED_BYTE is false
Testing format = RGBA and type = UNSIGNED_BYTE
Testing PACK_ALIGNMENT = 1, width = 1, height = 2
PASS getError was expected value: NO_ERROR :
@@ -112,111 +108,6 @@ PASS getError was expected value: INVALID_VALUE :
Testing PACK_ALIGNMENT = 8, width = -1, height = -1
PASS getError was expected value: NO_ERROR :
PASS getError was expected value: INVALID_VALUE :
-Testing the other supported format/type combination
-Testing PACK_ALIGNMENT = 1, width = 1, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 2, width = 1, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 4, width = 1, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 1, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 4, width = 2, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 2, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 4, width = 3, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 3, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 4, width = 4, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 4, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 5, height = 1
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 4, width = 5, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 5, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 6, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 7, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 8, width = 8, height = 2
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-PASS 255,102,0,0 is non-null.
-PASS pixel is expectedColor
-Testing PACK_ALIGNMENT = 1, width = 0, height = 0
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-Testing PACK_ALIGNMENT = 2, width = 0, height = 0
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-Testing PACK_ALIGNMENT = 4, width = 0, height = 0
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-Testing PACK_ALIGNMENT = 8, width = 0, height = 0
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: NO_ERROR :
-Testing PACK_ALIGNMENT = 1, width = -1, height = 1
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: INVALID_VALUE :
-Testing PACK_ALIGNMENT = 2, width = 1, height = -1
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: INVALID_VALUE :
-Testing PACK_ALIGNMENT = 4, width = 0, height = -1
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: INVALID_VALUE :
-Testing PACK_ALIGNMENT = 8, width = -1, height = -1
-PASS getError was expected value: NO_ERROR :
-PASS getError was expected value: INVALID_VALUE :
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
index fd29b1c..1973bcd 100644
--- a/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
+++ b/LayoutTests/fast/canvas/webgl/read-pixels-pack-alignment.html
@@ -39,8 +39,6 @@ var gl = null;
var array = null;
var pixel = [ 0, 0, 0, 0 ];
var expectedColor = [ 0, 0, 0, 0 ];
-var pixelFormat = 0;
-var pixelType = 0;
function calculatePixelBytes(format, type)
{
@@ -204,23 +202,11 @@ function runTestIteration(format, type, packAlignment, width, height)
shouldBe("pixel", "expectedColor");
}
-function checkSupportedPixelFormatAndType()
-{
- debug("Check supported pixel format/type besides RGBA/UNSIGNED_BYTE");
- glErrorShouldBe(gl, gl.NO_ERROR);
- pixelFormat = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_FORMAT);
- pixelType = gl.getParameter(gl.IMPLEMENTATION_COLOR_READ_TYPE);
- glErrorShouldBe(gl, gl.NO_ERROR);
- shouldBeFalse("pixelFormat == gl.RGBA && pixelType == gl.UNSIGNED_BYTE");
-}
-
description('Verify readPixels() works fine with various PACK_ALIGNMENT values.');
shouldBeNonNull("gl = initWebGL('example', 'vshader', 'fshader', [ 'pos', 'colorIn' ], [ 0, 0, 0, 1 ], 1)");
gl.disable(gl.BLEND);
-checkSupportedPixelFormatAndType();
-
debug("Testing format = RGBA and type = UNSIGNED_BYTE");
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 1, 1, 2);
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 2, 1, 2);
@@ -247,32 +233,6 @@ runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 2, 1, -1);
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 4, 0, -1);
runTestIteration(gl.RGBA, gl.UNSIGNED_BYTE, 8, -1, -1);
-debug("Testing the other supported format/type combination");
-runTestIteration(pixelFormat, pixelType, 1, 1, 2);
-runTestIteration(pixelFormat, pixelType, 2, 1, 2);
-runTestIteration(pixelFormat, pixelType, 4, 1, 2);
-runTestIteration(pixelFormat, pixelType, 8, 1, 2);
-runTestIteration(pixelFormat, pixelType, 4, 2, 2);
-runTestIteration(pixelFormat, pixelType, 8, 2, 2);
-runTestIteration(pixelFormat, pixelType, 4, 3, 2);
-runTestIteration(pixelFormat, pixelType, 8, 3, 2);
-runTestIteration(pixelFormat, pixelType, 4, 4, 2);
-runTestIteration(pixelFormat, pixelType, 8, 4, 2);
-runTestIteration(pixelFormat, pixelType, 8, 5, 1);
-runTestIteration(pixelFormat, pixelType, 4, 5, 2);
-runTestIteration(pixelFormat, pixelType, 8, 5, 2);
-runTestIteration(pixelFormat, pixelType, 8, 6, 2);
-runTestIteration(pixelFormat, pixelType, 8, 7, 2);
-runTestIteration(pixelFormat, pixelType, 8, 8, 2);
-runTestIteration(pixelFormat, pixelType, 1, 0, 0);
-runTestIteration(pixelFormat, pixelType, 2, 0, 0);
-runTestIteration(pixelFormat, pixelType, 4, 0, 0);
-runTestIteration(pixelFormat, pixelType, 8, 0, 0);
-runTestIteration(pixelFormat, pixelType, 1, -1, 1);
-runTestIteration(pixelFormat, pixelType, 2, 1, -1);
-runTestIteration(pixelFormat, pixelType, 4, 0, -1);
-runTestIteration(pixelFormat, pixelType, 8, -1, -1);
-
successfullyParsed = true;
</script>
<script src="../../js/resources/js-test-post.js"></script>
diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt b/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
index b5ce20b..bf65ff1 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
+++ b/LayoutTests/fast/canvas/webgl/webgl-specific-expected.txt
@@ -27,6 +27,8 @@ PASS getError was expected value: INVALID_OPERATION : a different reference valu
PASS getError was expected value: INVALID_OPERATION : a different reference value for front and back facing is illegal
PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
PASS getError was expected value: INVALID_OPERATION : a different mask value for front and back facing is illegal
+PASS undefined is undefined.
+PASS undefined is undefined.
PASS successfullyParsed is true
TEST COMPLETE
diff --git a/LayoutTests/fast/canvas/webgl/webgl-specific.html b/LayoutTests/fast/canvas/webgl/webgl-specific.html
index a8f55f8..759f9ab 100644
--- a/LayoutTests/fast/canvas/webgl/webgl-specific.html
+++ b/LayoutTests/fast/canvas/webgl/webgl-specific.html
@@ -98,6 +98,9 @@ gl.stencilFuncSeparate(gl.BACK, gl.ALWAYS, 0, 1);
glErrorShouldBe(gl, gl.INVALID_OPERATION,
"a different mask value for front and back facing is illegal");
+shouldBeUndefined(gl.IMPLEMENTATION_COLOR_READ_FORMAT);
+shouldBeUndefined(gl.IMPLEMENTATION_COLOR_READ_TYPE);
+
successfullyParsed = true;
</script>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index e5133ce..6fb1413 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -2,6 +2,23 @@
Reviewed by Kenneth Russell.
+ Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
+ https://bugs.webkit.org/show_bug.cgi?id=48938
+
+ * html/canvas/WebGLRenderingContext.cpp:
+ (WebCore::WebGLRenderingContext::initializeNewContext):
+ (WebCore::WebGLRenderingContext::getParameter):
+ (WebCore::WebGLRenderingContext::readPixels):
+ * html/canvas/WebGLRenderingContext.h:
+ * html/canvas/WebGLRenderingContext.idl:
+ * platform/graphics/GraphicsContext3D.h:
+ * platform/graphics/opengl/GraphicsContext3DOpenGL.cpp:
+ (WebCore::GraphicsContext3D::getIntegerv):
+
+2010-11-04 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
TypedArray should throw exception if length not a multiple of element size
https://bugs.webkit.org/show_bug.cgi?id=45487
diff --git a/WebCore/html/canvas/WebGLRenderingContext.cpp b/WebCore/html/canvas/WebGLRenderingContext.cpp
index 5936fe7..5d4fdd9 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.cpp
+++ b/WebCore/html/canvas/WebGLRenderingContext.cpp
@@ -138,13 +138,6 @@ void WebGLRenderingContext::initializeNewContext()
m_context->getIntegerv(GraphicsContext3D::MAX_VERTEX_ATTRIBS, &numVertexAttribs);
m_maxVertexAttribs = numVertexAttribs;
- int implementationColorReadFormat = GraphicsContext3D::RGBA;
- m_context->getIntegerv(GraphicsContext3D::IMPLEMENTATION_COLOR_READ_FORMAT, &implementationColorReadFormat);
- m_implementationColorReadFormat = implementationColorReadFormat;
- int implementationColorReadType = GraphicsContext3D::UNSIGNED_BYTE;
- m_context->getIntegerv(GraphicsContext3D::IMPLEMENTATION_COLOR_READ_TYPE, &implementationColorReadType);
- m_implementationColorReadType = implementationColorReadType;
-
m_maxTextureSize = 0;
m_context->getIntegerv(GraphicsContext3D::MAX_TEXTURE_SIZE, &m_maxTextureSize);
m_maxTextureLevel = WebGLTexture::computeLevelCount(m_maxTextureSize, m_maxTextureSize);
@@ -1488,10 +1481,6 @@ WebGLGetInfo WebGLRenderingContext::getParameter(unsigned long pname, ExceptionC
return getUnsignedLongParameter(pname);
case GraphicsContext3D::GREEN_BITS:
return getLongParameter(pname);
- case GraphicsContext3D::IMPLEMENTATION_COLOR_READ_FORMAT:
- return getLongParameter(pname);
- case GraphicsContext3D::IMPLEMENTATION_COLOR_READ_TYPE:
- return getLongParameter(pname);
case GraphicsContext3D::LINE_WIDTH:
return getFloatParameter(pname);
case GraphicsContext3D::MAX_COMBINED_TEXTURE_IMAGE_UNITS:
@@ -2160,7 +2149,7 @@ void WebGLRenderingContext::readPixels(long x, long y, long width, long height,
m_context->synthesizeGLError(GraphicsContext3D::INVALID_VALUE);
return;
}
- if (!((format == GraphicsContext3D::RGBA && type == GraphicsContext3D::UNSIGNED_BYTE) || (format == m_implementationColorReadFormat && type == m_implementationColorReadType))) {
+ if (format != GraphicsContext3D::RGBA || type != GraphicsContext3D::UNSIGNED_BYTE) {
m_context->synthesizeGLError(GraphicsContext3D::INVALID_OPERATION);
return;
}
diff --git a/WebCore/html/canvas/WebGLRenderingContext.h b/WebCore/html/canvas/WebGLRenderingContext.h
index 99d2c79..5f66248 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.h
+++ b/WebCore/html/canvas/WebGLRenderingContext.h
@@ -420,8 +420,6 @@ public:
int m_packAlignment;
int m_unpackAlignment;
- unsigned long m_implementationColorReadFormat;
- unsigned long m_implementationColorReadType;
bool m_unpackFlipY;
bool m_unpackPremultiplyAlpha;
bool m_contextLost;
diff --git a/WebCore/html/canvas/WebGLRenderingContext.idl b/WebCore/html/canvas/WebGLRenderingContext.idl
index c45e880..4d41b78 100644
--- a/WebCore/html/canvas/WebGLRenderingContext.idl
+++ b/WebCore/html/canvas/WebGLRenderingContext.idl
@@ -392,10 +392,6 @@ module html {
const unsigned int VERTEX_ATTRIB_ARRAY_POINTER = 0x8645;
const unsigned int VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F;
- /* Read Format */
- const unsigned int IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A;
- const unsigned int IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B;
-
/* Shader Source */
const unsigned int COMPILE_STATUS = 0x8B81;
const unsigned int INFO_LOG_LENGTH = 0x8B84;
diff --git a/WebCore/platform/graphics/GraphicsContext3D.h b/WebCore/platform/graphics/GraphicsContext3D.h
index d8059e5..e34a2f8 100644
--- a/WebCore/platform/graphics/GraphicsContext3D.h
+++ b/WebCore/platform/graphics/GraphicsContext3D.h
@@ -351,8 +351,6 @@ public:
VERTEX_ATTRIB_ARRAY_NORMALIZED = 0x886A,
VERTEX_ATTRIB_ARRAY_POINTER = 0x8645,
VERTEX_ATTRIB_ARRAY_BUFFER_BINDING = 0x889F,
- IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A,
- IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B,
COMPILE_STATUS = 0x8B81,
INFO_LOG_LENGTH = 0x8B84,
SHADER_SOURCE_LENGTH = 0x8B88,
diff --git a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
index 4016ffb..a6b6466 100644
--- a/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
+++ b/WebCore/platform/graphics/opengl/GraphicsContext3DOpenGL.cpp
@@ -1117,21 +1117,12 @@ void GraphicsContext3D::getFramebufferAttachmentParameteriv(unsigned long target
void GraphicsContext3D::getIntegerv(unsigned long pname, int* value)
{
- // Need to emulate IMPLEMENTATION_COLOR_READ_FORMAT/TYPE for GL. Any valid
- // combination should work, but GL_RGB/GL_UNSIGNED_BYTE might be the most
- // useful for desktop WebGL users.
// Need to emulate MAX_FRAGMENT/VERTEX_UNIFORM_VECTORS and MAX_VARYING_VECTORS
// because desktop GL's corresponding queries return the number of components
// whereas GLES2 return the number of vectors (each vector has 4 components).
// Therefore, the value returned by desktop GL needs to be divided by 4.
makeContextCurrent();
switch (pname) {
- case IMPLEMENTATION_COLOR_READ_FORMAT:
- *value = GL_RGB;
- break;
- case IMPLEMENTATION_COLOR_READ_TYPE:
- *value = GL_UNSIGNED_BYTE;
- break;
case MAX_FRAGMENT_UNIFORM_VECTORS:
::glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, value);
*value /= 4;
diff --git a/WebKit/chromium/ChangeLog b/WebKit/chromium/ChangeLog
index c9e790b..a7bcbd1 100644
--- a/WebKit/chromium/ChangeLog
+++ b/WebKit/chromium/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-04 Zhenyao Mo <zmo at google.com>
+
+ Reviewed by Kenneth Russell.
+
+ Remove IMPLEMENTATION_COLOR_READ_FORMAT and TYPE
+ https://bugs.webkit.org/show_bug.cgi?id=48938
+
+ * src/WebGraphicsContext3DDefaultImpl.cpp:
+ (WebKit::WebGraphicsContext3DDefaultImpl::getIntegerv):
+
2010-11-04 Kavita Kanetkar <kkanetkar at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
index 8df217a..14d3e8e 100644
--- a/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
+++ b/WebKit/chromium/src/WebGraphicsContext3DDefaultImpl.cpp
@@ -49,8 +49,6 @@
namespace WebKit {
enum {
- IMPLEMENTATION_COLOR_READ_FORMAT = 0x8B9B,
- IMPLEMENTATION_COLOR_READ_TYPE = 0x8B9A,
MAX_VERTEX_UNIFORM_VECTORS = 0x8DFB,
MAX_VARYING_VECTORS = 0x8DFC,
MAX_FRAGMENT_UNIFORM_VECTORS = 0x8DFD
@@ -962,21 +960,12 @@ void WebGraphicsContext3DDefaultImpl::getFramebufferAttachmentParameteriv(unsign
void WebGraphicsContext3DDefaultImpl::getIntegerv(unsigned long pname, int* value)
{
- // Need to emulate IMPLEMENTATION_COLOR_READ_FORMAT/TYPE for GL. Any valid
- // combination should work, but GL_RGB/GL_UNSIGNED_BYTE might be the most
- // useful for desktop WebGL users.
// Need to emulate MAX_FRAGMENT/VERTEX_UNIFORM_VECTORS and MAX_VARYING_VECTORS
// because desktop GL's corresponding queries return the number of components
// whereas GLES2 return the number of vectors (each vector has 4 components).
// Therefore, the value returned by desktop GL needs to be divided by 4.
makeContextCurrent();
switch (pname) {
- case IMPLEMENTATION_COLOR_READ_FORMAT:
- *value = GL_RGB;
- break;
- case IMPLEMENTATION_COLOR_READ_TYPE:
- *value = GL_UNSIGNED_BYTE;
- break;
case MAX_FRAGMENT_UNIFORM_VECTORS:
glGetIntegerv(GL_MAX_FRAGMENT_UNIFORM_COMPONENTS, value);
*value /= 4;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list