Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-17 15:25:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 665070 - part 4: rename mSynthesizedGLError to mWebGLError - r=jrmuizel

Browse Source
This commit is contained in:
Benoit Jacob 2011-07-07 20:01:16 -04:00
parent f95fa9b753
commit c1d0dbfdae
5 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
content/canvas/src/WebGLContext.cpp
View File

@ -226,7 +226,7 @@ WebGLContext::WebGLContext()
mOptionsFrozen = PR_FALSE;
mActiveTexture = 0;
mSynthesizedGLError = LOCAL_GL_NO_ERROR;
mWebGLError = LOCAL_GL_NO_ERROR;
mPixelStoreFlipY = PR_FALSE;
mPixelStorePremultiplyAlpha = PR_FALSE;
mPixelStoreColorspaceConversion = BROWSER_DEFAULT_WEBGL;

2
content/canvas/src/WebGLContext.h
View File

@ -427,7 +427,7 @@ protected:
PRPackedBool mOptionsFrozen;
WebGLuint mActiveTexture;
WebGLenum mSynthesizedGLError;
WebGLenum mWebGLError;
// whether shader validation is supported
PRBool mShaderValidation;

8
content/canvas/src/WebGLContextGL.cpp
View File

@ -2230,11 +2230,11 @@ WebGLContext::GetError(WebGLenum *_retval)
// real GL error.
WebGLenum err = gl->GetAndClearError();
// mSynthesizedGLError has the first error that occurred,
// mWebGLError has the first error that occurred,
// whether synthesized or real; if it's not NO_ERROR, use it.
if (mSynthesizedGLError != LOCAL_GL_NO_ERROR) {
err = mSynthesizedGLError;
mSynthesizedGLError = LOCAL_GL_NO_ERROR;
if (mWebGLError != LOCAL_GL_NO_ERROR) {
err = mWebGLError;
mWebGLError = LOCAL_GL_NO_ERROR;
}
*_retval = err;

8
content/canvas/src/WebGLContextUtils.cpp
View File

@ -125,13 +125,13 @@ WebGLContext::SynthesizeGLError(WebGLenum err)
// that may have occurred before this one and use that code
// instead.
if (mSynthesizedGLError == LOCAL_GL_NO_ERROR) {
if (mWebGLError == LOCAL_GL_NO_ERROR) {
MakeContextCurrent();
mSynthesizedGLError = gl->fGetError();
mWebGLError = gl->fGetError();
if (mSynthesizedGLError == LOCAL_GL_NO_ERROR)
mSynthesizedGLError = err;
if (mWebGLError == LOCAL_GL_NO_ERROR)
mWebGLError = err;
}
return NS_OK;

2
content/canvas/src/WebGLContextValidate.cpp
View File

@ -476,7 +476,7 @@ WebGLContext::InitAndValidateGL()
}
mActiveTexture = 0;
mSynthesizedGLError = LOCAL_GL_NO_ERROR;
mWebGLError = LOCAL_GL_NO_ERROR;
mAttribBuffers.Clear();