mozilla
/
gecko-dev
зеркало из https://github.com/mozilla/gecko-dev.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Backed out 2 changesets (bug 1359055) for Win7 failures in test_conformance__extensions__webgl-compressed-texture-size-limit.html 

Backed out changeset 41850a57de47 (bug 1359055)
Backed out changeset 7c2db4c459cc (bug 1359055)

MozReview-Commit-ID: CsWGhuHvqIx
This commit is contained in:
Phil Ringnalda 2017-08-29 22:02:56 -07:00
Родитель 5c91c89501
Коммит 55ac177c22
8 изменённых файлов: 39 добавлений и 94 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

27
dom/canvas/WebGL2Context.h
Просмотреть файл

@ -115,17 +115,6 @@ protected:
////////////////////////////////////
public:
void CompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat,
GLsizei width, GLsizei height, GLsizei depth, GLint border,
GLsizei imageSize, WebGLintptr offset)
{
const char funcName[] = "compressedTexImage3D";
const uint8_t funcDims = 3;
const TexImageSourceAdapter src(&offset, 0, 0);
CompressedTexImage(funcName, funcDims, target, level, internalFormat, width,
height, depth, border, src, Some(imageSize));
}
template<typename T>
void CompressedTexImage3D(GLenum target, GLint level, GLenum internalFormat,
GLsizei width, GLsizei height, GLsizei depth, GLint border,
@ -136,19 +125,7 @@ public:
const uint8_t funcDims = 3;
const TexImageSourceAdapter src(&anySrc, viewElemOffset, viewElemLengthOverride);
CompressedTexImage(funcName, funcDims, target, level, internalFormat, width,
height, depth, border, src, Nothing());
}
void CompressedTexSubImage3D(GLenum target, GLint level, GLint xOffset, GLint yOffset,
GLint zOffset, GLsizei width, GLsizei height,
GLsizei depth, GLenum unpackFormat,
GLsizei imageSize, WebGLintptr offset)
{
const char funcName[] = "compressedTexSubImage3D";
const uint8_t funcDims = 3;
const TexImageSourceAdapter src(&offset, 0, 0);
CompressedTexSubImage(funcName, funcDims, target, level, xOffset, yOffset,
zOffset, width, height, depth, unpackFormat, src, Some(imageSize));
height, depth, border, src);
}
template<typename T>
@ -162,7 +139,7 @@ public:
const uint8_t funcDims = 3;
const TexImageSourceAdapter src(&anySrc, viewElemOffset, viewElemLengthOverride);
CompressedTexSubImage(funcName, funcDims, target, level, xOffset, yOffset,
zOffset, width, height, depth, unpackFormat, src, Nothing());
zOffset, width, height, depth, unpackFormat, src);
}
////////////////////////////////////

38
dom/canvas/WebGLContext.h
Просмотреть файл

@ -1052,18 +1052,6 @@ protected:
////////////////////////////////////
public:
void CompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat,
GLsizei width, GLsizei height, GLint border,
GLsizei imageSize, WebGLsizeiptr offset)
{
const char funcName[] = "compressedTexImage2D";
const uint8_t funcDims = 2;
const GLsizei depth = 1;
const TexImageSourceAdapter src(&offset, 0, 0);
CompressedTexImage(funcName, funcDims, target, level, internalFormat, width,
height, depth, border, src, Some(imageSize));
}
template<typename T>
void CompressedTexImage2D(GLenum target, GLint level, GLenum internalFormat,
GLsizei width, GLsizei height, GLint border,
@ -1075,20 +1063,7 @@ public:
const GLsizei depth = 1;
const TexImageSourceAdapter src(&anySrc, viewElemOffset, viewElemLengthOverride);
CompressedTexImage(funcName, funcDims, target, level, internalFormat, width,
height, depth, border, src, Nothing());
}
void CompressedTexSubImage2D(GLenum target, GLint level, GLint xOffset, GLint yOffset,
GLsizei width, GLsizei height, GLenum unpackFormat,
GLsizei imageSize, WebGLsizeiptr offset)
{
const char funcName[] = "compressedTexSubImage2D";
const uint8_t funcDims = 2;
const GLint zOffset = 0;
const GLsizei depth = 1;
const TexImageSourceAdapter src(&offset, 0, 0);
CompressedTexSubImage(funcName, funcDims, target, level, xOffset, yOffset,
zOffset, width, height, depth, unpackFormat, src, Some(imageSize));
height, depth, border, src);
}
template<typename T>
@ -1103,19 +1078,20 @@ public:
const GLsizei depth = 1;
const TexImageSourceAdapter src(&anySrc, viewElemOffset, viewElemLengthOverride);
CompressedTexSubImage(funcName, funcDims, target, level, xOffset, yOffset,
zOffset, width, height, depth, unpackFormat, src, Nothing());
zOffset, width, height, depth, unpackFormat, src);
}
protected:
void CompressedTexImage(const char* funcName, uint8_t funcDims, GLenum target,
GLint level, GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize);
const TexImageSource& src);
void CompressedTexSubImage(const char* funcName, uint8_t funcDims, GLenum target,
GLint level, GLint xOffset, GLint yOffset, GLint zOffset,
GLsizei width, GLsizei height, GLsizei depth,
GLenum unpackFormat, const TexImageSource& src,
const Maybe<GLsizei>& expectedImageSize);
GLenum unpackFormat, const TexImageSource& src);
////////////////////////////////////
public:
@ -1281,7 +1257,7 @@ protected:
UniquePtr<webgl::TexUnpackBytes>
FromCompressed(const char* funcName, TexImageTarget target, GLsizei rawWidth,
GLsizei rawHeight, GLsizei rawDepth, GLint border,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize);
const TexImageSource& src);
// -----------------------------------------------------------------------------
// Vertices Feature (WebGLContextVertices.cpp)

8
dom/canvas/WebGLContextTextures.cpp
Просмотреть файл

@ -318,7 +318,7 @@ void
WebGLContext::CompressedTexImage(const char* funcName, uint8_t funcDims, GLenum rawTarget,
GLint level, GLenum internalFormat, GLsizei width,
GLsizei height, GLsizei depth, GLint border,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize)
const TexImageSource& src)
{
TexImageTarget target;
WebGLTexture* tex;
@ -326,7 +326,7 @@ WebGLContext::CompressedTexImage(const char* funcName, uint8_t funcDims, GLenum
return;
tex->CompressedTexImage(funcName, target, level, internalFormat, width, height, depth,
border, src, expectedImageSize);
border, src);
}
void
@ -334,7 +334,7 @@ WebGLContext::CompressedTexSubImage(const char* funcName, uint8_t funcDims,
GLenum rawTarget, GLint level, GLint xOffset,
GLint yOffset, GLint zOffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum unpackFormat,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize)
const TexImageSource& src)
{
TexImageTarget target;
WebGLTexture* tex;
@ -342,7 +342,7 @@ WebGLContext::CompressedTexSubImage(const char* funcName, uint8_t funcDims,
return;
tex->CompressedTexSubImage(funcName, target, level, xOffset, yOffset, zOffset, width,
height, depth, unpackFormat, src, expectedImageSize);
height, depth, unpackFormat, src);
}
////

5
dom/canvas/WebGLTexture.h
Просмотреть файл

@ -273,12 +273,11 @@ protected:
public:
void CompressedTexImage(const char* funcName, TexImageTarget target, GLint level,
GLenum internalFormat, GLsizei width, GLsizei height,
GLsizei depth, GLint border, const TexImageSource& src,
const Maybe<GLsizei>& expectedImageSize);
GLsizei depth, GLint border, const TexImageSource& src);
void CompressedTexSubImage(const char* funcName, TexImageTarget target, GLint level,
GLint xOffset, GLint yOffset, GLint zOffset, GLsizei width,
GLsizei height, GLsizei depth, GLenum sizedUnpackFormat,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize);
const TexImageSource& src);
void CopyTexImage2D(TexImageTarget target, GLint level, GLenum internalFormat,
GLint x, GLint y, GLsizei width, GLsizei height, GLint border);

35
dom/canvas/WebGLTextureUpload.cpp
Просмотреть файл

@ -186,8 +186,7 @@ FromView(WebGLContext* webgl, const char* funcName, TexImageTarget target,
static UniquePtr<webgl::TexUnpackBytes>
FromPboOffset(WebGLContext* webgl, const char* funcName, TexImageTarget target,
uint32_t width, uint32_t height, uint32_t depth, WebGLsizeiptr pboOffset,
const Maybe<GLsizei>& expectedImageSize)
uint32_t width, uint32_t height, uint32_t depth, WebGLsizeiptr pboOffset)
{
if (pboOffset < 0) {
webgl->ErrorInvalidValue("%s: offset cannot be negative.", funcName);
@ -205,17 +204,7 @@ FromPboOffset(WebGLContext* webgl, const char* funcName, TexImageTarget target,
return nullptr;
}
availBufferBytes -= pboOffset;
if (expectedImageSize.isSome()) {
if (expectedImageSize.ref() < 0) {
webgl->ErrorInvalidValue("%s: ImageSize can't be less than 0.", funcName);
return nullptr;
}
if (size_t(expectedImageSize.ref()) != availBufferBytes) {
webgl->ErrorInvalidOperation("%s: ImageSize doesn't match the required upload byte size.", funcName);
return nullptr;
}
availBufferBytes = size_t(expectedImageSize.ref());
}
const bool isClientData = false;
const auto ptr = (const uint8_t*)pboOffset;
return MakeUnique<webgl::TexUnpackBytes>(webgl, target, width, height, depth,
@ -410,7 +399,7 @@ WebGLContext::From(const char* funcName, TexImageTarget target, GLsizei rawWidth
if (src.mPboOffset) {
return FromPboOffset(this, funcName, target, width, height, depth,
*(src.mPboOffset), Nothing());
*(src.mPboOffset));
}
if (mBoundPixelUnpackBuffer) {
@ -1426,8 +1415,7 @@ WebGLTexture::TexSubImage(const char* funcName, TexImageTarget target, GLint lev
UniquePtr<webgl::TexUnpackBytes>
WebGLContext::FromCompressed(const char* funcName, TexImageTarget target,
GLsizei rawWidth, GLsizei rawHeight, GLsizei rawDepth,
GLint border, const TexImageSource& src,
const Maybe<GLsizei>& expectedImageSize)
GLint border, const TexImageSource& src)
{
uint32_t width, height, depth;
if (!ValidateExtents(this, funcName, rawWidth, rawHeight, rawDepth, border, &width,
@ -1438,7 +1426,7 @@ WebGLContext::FromCompressed(const char* funcName, TexImageTarget target,
if (src.mPboOffset) {
return FromPboOffset(this, funcName, target, width, height, depth,
*(src.mPboOffset), expectedImageSize);
*(src.mPboOffset));
}
if (mBoundPixelUnpackBuffer) {
@ -1454,10 +1442,10 @@ void
WebGLTexture::CompressedTexImage(const char* funcName, TexImageTarget target, GLint level,
GLenum internalFormat, GLsizei rawWidth,
GLsizei rawHeight, GLsizei rawDepth, GLint border,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize)
const TexImageSource& src)
{
const auto blob = mContext->FromCompressed(funcName, target, rawWidth, rawHeight,
rawDepth, border, src, expectedImageSize);
rawDepth, border, src);
if (!blob)
return;
@ -1512,8 +1500,6 @@ WebGLTexture::CompressedTexImage(const char* funcName, TexImageTarget target, GL
// Do the thing!
mContext->gl->MakeCurrent();
const ScopedLazyBind bindPBO(mContext->gl, LOCAL_GL_PIXEL_UNPACK_BUFFER,
mContext->mBoundPixelUnpackBuffer);
// Warning: Possibly shared memory. See bug 1225033.
GLenum error = DoCompressedTexImage(mContext->gl, target, level, internalFormat,
@ -1567,11 +1553,11 @@ WebGLTexture::CompressedTexSubImage(const char* funcName, TexImageTarget target,
GLint level, GLint xOffset, GLint yOffset,
GLint zOffset, GLsizei rawWidth, GLsizei rawHeight,
GLsizei rawDepth, GLenum sizedUnpackFormat,
const TexImageSource& src, const Maybe<GLsizei>& expectedImageSize)
const TexImageSource& src)
{
const GLint border = 0;
const auto blob = mContext->FromCompressed(funcName, target, rawWidth, rawHeight,
rawDepth, border, src, expectedImageSize);
rawDepth, border, src);
if (!blob)
return;
@ -1665,9 +1651,6 @@ WebGLTexture::CompressedTexSubImage(const char* funcName, TexImageTarget target,
return;
}
const ScopedLazyBind bindPBO(mContext->gl, LOCAL_GL_PIXEL_UNPACK_BUFFER,
mContext->mBoundPixelUnpackBuffer);
// Warning: Possibly shared memory. See bug 1225033.
GLenum error = DoCompressedTexSubImage(mContext->gl, target, level, xOffset, yOffset,
zOffset, blob->mWidth, blob->mHeight,

4
dom/canvas/test/webgl-conf/generated-mochitest.ini
Просмотреть файл

@ -6206,6 +6206,7 @@ skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-compressed-texture-atc.html]
skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-compressed-texture-etc.html]
fail-if = (os == 'mac') || (os == 'win')
skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-compressed-texture-pvrtc.html]
skip-if = (os == 'android' || os == 'linux')
@ -6214,7 +6215,7 @@ skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-compressed-texture-s3tc.html]
skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html]
skip-if = (os == 'android' || os == 'linux')
skip-if = (os == 'win') || (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-debug-renderer-info.html]
skip-if = (os == 'android' || os == 'linux')
[generated/test_2_conformance__extensions__webgl-debug-shaders.html]
@ -7607,6 +7608,7 @@ fail-if = (os == 'mac') || (os == 'linux') || (os == 'win')
[generated/test_conformance__extensions__webgl-compressed-texture-s3tc-srgb.html]
[generated/test_conformance__extensions__webgl-compressed-texture-s3tc.html]
[generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html]
skip-if = (os == 'win')
[generated/test_conformance__extensions__webgl-debug-renderer-info.html]
[generated/test_conformance__extensions__webgl-debug-shaders.html]
[generated/test_conformance__extensions__webgl-depth-texture.html]

8
dom/canvas/test/webgl-conf/mochitest-errata.ini
Просмотреть файл

@ -327,6 +327,8 @@ fail-if = (os == 'mac') || (os == 'win')
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance2__textures__video__tex-3d-srgb8_alpha8-rgba-unsigned_byte.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__extensions__webgl-compressed-texture-etc.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_byte.html]
fail-if = (os == 'mac') || (os == 'win')
[generated/test_2_conformance__textures__video__tex-2d-rgb-rgb-unsigned_short_5_6_5.html]
@ -863,6 +865,9 @@ skip-if = (os == 'win' && debug)
[generated/test_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
# time out crash
skip-if = (os == 'win' && debug)
[generated/test_conformance__extensions__webgl-compressed-texture-size-limit.html]
# skip this because the result is not always pass
skip-if = (os == 'win')
[generated/test_2_conformance2__glsl3__loops-with-side-effects.html]
# application crashed [@ nvoglv32.dll + 0x999512]
skip-if = (os == 'win')
@ -933,6 +938,9 @@ skip-if = (os == 'win' && os_version == '6.1')
[generated/test_2_conformance__textures__misc__tex-image-and-sub-image-2d-with-array-buffer-view.html]
# Failure on win7 but got passed on win7 vm
skip-if = (os == 'win' && os_version == '6.1')
[generated/test_2_conformance__extensions__webgl-compressed-texture-size-limit.html]
# Test timed out.
skip-if = (os == 'win')
[generated/test_2_conformance2__textures__misc__tex-input-validation.html]
skip-if = (os == 'win')
[generated/test_2_conformance2__buffers__get-buffer-sub-data.html]

8
dom/webidl/WebGL2RenderingContext.webidl
Просмотреть файл

@ -511,19 +511,19 @@ interface WebGL2RenderingContextBase
GLint x, GLint y, GLsizei width, GLsizei height);
void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
GLsizei height, GLint border, GLsizei imageSize, GLintptr offset);
GLsizei height, GLint border, GLintptr offset);
void compressedTexImage2D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
GLsizei height, GLint border, ArrayBufferView srcData,
optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, GLintptr offset);
GLsizei height, GLsizei depth, GLint border, GLintptr offset);
void compressedTexImage3D(GLenum target, GLint level, GLenum internalformat, GLsizei width,
GLsizei height, GLsizei depth, GLint border, ArrayBufferView srcData,
optional GLuint srcOffset = 0, optional GLuint srcLengthOverride = 0);
void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, GLintptr offset);
GLsizei width, GLsizei height, GLenum format, GLintptr offset);
void compressedTexSubImage2D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLsizei width, GLsizei height, GLenum format,
ArrayBufferView srcData,
@ -532,7 +532,7 @@ interface WebGL2RenderingContextBase
void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLenum format, GLsizei imageSize, GLintptr offset);
GLenum format, GLintptr offset);
void compressedTexSubImage3D(GLenum target, GLint level, GLint xoffset, GLint yoffset,
GLint zoffset, GLsizei width, GLsizei height, GLsizei depth,
GLenum format, ArrayBufferView srcData,