Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 21:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1390386 - fGetError should use BEFORE_GL_CALL. - r=jrmuizel

Browse Source 
MozReview-Commit-ID: B8sR38Bzjb5
This commit is contained in:
Jeff Gilbert 2017-08-17 15:01:27 -07:00
parent ea479cbf60
commit fc61254cca
1 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
gfx/gl/GLContext.h
View File

@ -567,7 +567,6 @@ private:
return err;
}
public:
GLenum FlushErrors() const {
GLenum err = RawGetErrorAndClear();
if (!mTopError)
@ -575,18 +574,10 @@ public:
return err;
}
// We smash all errors together, so you never have to loop on this. We
// guarantee that immediately after this call, there are no errors left.
GLenum fGetError() {
FlushErrors();
GLenum err = mTopError;
mTopError = LOCAL_GL_NO_ERROR;
return err;
}
////////////////////////////////////
// Use this safer option.
public:
class LocalErrorScope;
private:
@ -783,6 +774,19 @@ public:
// -----------------------------------------------------------------------------
// GL official entry points
public:
// We smash all errors together, so you never have to loop on this. We
// guarantee that immediately after this call, there are no errors left.
GLenum fGetError() {
GLenum err = LOCAL_GL_CONTEXT_LOST;
BEFORE_GL_CALL;
FlushErrors();
err = mTopError;
mTopError = LOCAL_GL_NO_ERROR;
AFTER_GL_CALL;
return err;
}
void fActiveTexture(GLenum texture) {
BEFORE_GL_CALL;