Source/modules/webgl/WebGLRenderingContextBase.cpp - Issue 1306343007: Fix base level for generateMipmap in blink

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1306343007: Fix base level for generateMipmap in blink (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: large base level Created 5 years, 3 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:

Index: Source/modules/webgl/WebGLRenderingContextBase.cpp

diff --git a/Source/modules/webgl/WebGLRenderingContextBase.cpp b/Source/modules/webgl/WebGLRenderingContextBase.cpp

index 6e2e716e43a1eb68dddf9295ec1247d6d12bc217..4b2170d16e65b5e3c5722d49bed58eec1785f5ab 100644

--- a/Source/modules/webgl/WebGLRenderingContextBase.cpp

+++ b/Source/modules/webgl/WebGLRenderingContextBase.cpp

@@ -2381,7 +2381,7 @@ void WebGLRenderingContextBase::generateMipmap(GLenum target)

if (!tex)

return;

if (!tex->canGenerateMipmaps()) {

- synthesizeGLError(GL_INVALID_OPERATION, "generateMipmap", "level 0 not power of 2 or not all the same size");

+ synthesizeGLError(GL_INVALID_OPERATION, "generateMipmap", "cannot generate mipmaps");

return;

}

if (tex->getInternalFormat(target, 0) == GL_SRGB_EXT || tex->getInternalFormat(target, 0) == GL_SRGB_ALPHA_EXT) {