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

Bug 821191 - Fix mysterious 5-space indent region in GLContext.h - r=bjacob

Browse Source
This commit is contained in:
Jeff Gilbert 2012-12-17 17:58:44 -08:00
parent db09531eff
commit 9e4b74bfe1
1 changed files with 136 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

271
gfx/gl/GLContext.h
View File

@ -2699,167 +2699,168 @@ public:
#ifdef DEBUG #ifdef DEBUG
GLContext *TrackingContext() { GLContext *TrackingContext() {
GLContext *tip = this; GLContext *tip = this;
while (tip->mSharedContext) while (tip->mSharedContext)
tip = tip->mSharedContext; tip = tip->mSharedContext;
return tip; return tip;
} }
#define TRACKING_CONTEXT(a) do { TrackingContext()->a; } while (0) #define TRACKING_CONTEXT(a) do { TrackingContext()->a; } while (0)
#else #else
#define TRACKING_CONTEXT(a) do {} while (0) #define TRACKING_CONTEXT(a) do {} while (0)
#endif #endif
GLuint GLAPIENTRY fCreateProgram() { GLuint GLAPIENTRY fCreateProgram() {
BEFORE_GL_CALL; BEFORE_GL_CALL;
GLuint ret = mSymbols.fCreateProgram(); GLuint ret = mSymbols.fCreateProgram();
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedProgram(this, ret)); TRACKING_CONTEXT(CreatedProgram(this, ret));
return ret; return ret;
} }
GLuint GLAPIENTRY fCreateShader(GLenum t) { GLuint GLAPIENTRY fCreateShader(GLenum t) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
GLuint ret = mSymbols.fCreateShader(t); GLuint ret = mSymbols.fCreateShader(t);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedShader(this, ret)); TRACKING_CONTEXT(CreatedShader(this, ret));
return ret; return ret;
} }
void GLAPIENTRY fGenBuffers(GLsizei n, GLuint* names) { void GLAPIENTRY fGenBuffers(GLsizei n, GLuint* names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGenBuffers(n, names); mSymbols.fGenBuffers(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedBuffers(this, n, names)); TRACKING_CONTEXT(CreatedBuffers(this, n, names));
} }
void GLAPIENTRY fGenTextures(GLsizei n, GLuint* names) { void GLAPIENTRY fGenTextures(GLsizei n, GLuint* names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGenTextures(n, names); mSymbols.fGenTextures(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedTextures(this, n, names)); TRACKING_CONTEXT(CreatedTextures(this, n, names));
} }
void GLAPIENTRY fGenFramebuffers(GLsizei n, GLuint* names) { void GLAPIENTRY fGenFramebuffers(GLsizei n, GLuint* names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGenFramebuffers(n, names); mSymbols.fGenFramebuffers(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedFramebuffers(this, n, names)); TRACKING_CONTEXT(CreatedFramebuffers(this, n, names));
} }
void GLAPIENTRY fGenRenderbuffers(GLsizei n, GLuint* names) { void GLAPIENTRY fGenRenderbuffers(GLsizei n, GLuint* names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGenRenderbuffers(n, names); mSymbols.fGenRenderbuffers(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(CreatedRenderbuffers(this, n, names)); TRACKING_CONTEXT(CreatedRenderbuffers(this, n, names));
} }
void GLAPIENTRY fDeleteProgram(GLuint program) { void GLAPIENTRY fDeleteProgram(GLuint program) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteProgram(program); mSymbols.fDeleteProgram(program);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedProgram(this, program)); TRACKING_CONTEXT(DeletedProgram(this, program));
} }
void GLAPIENTRY fDeleteShader(GLuint shader) { void GLAPIENTRY fDeleteShader(GLuint shader) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteShader(shader); mSymbols.fDeleteShader(shader);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedShader(this, shader)); TRACKING_CONTEXT(DeletedShader(this, shader));
} }
void GLAPIENTRY fDeleteBuffers(GLsizei n, GLuint *names) { void GLAPIENTRY fDeleteBuffers(GLsizei n, GLuint *names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteBuffers(n, names); mSymbols.fDeleteBuffers(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedBuffers(this, n, names)); TRACKING_CONTEXT(DeletedBuffers(this, n, names));
} }
void GLAPIENTRY fDeleteTextures(GLsizei n, GLuint *names) { void GLAPIENTRY fDeleteTextures(GLsizei n, GLuint *names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteTextures(n, names); mSymbols.fDeleteTextures(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedTextures(this, n, names)); TRACKING_CONTEXT(DeletedTextures(this, n, names));
} }
void GLAPIENTRY fDeleteFramebuffers(GLsizei n, GLuint *names) { void GLAPIENTRY fDeleteFramebuffers(GLsizei n, GLuint *names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
if (n == 1 && *names == 0) { if (n == 1 && *names == 0) {
/* Deleting framebuffer 0 causes hangs on the DROID. See bug 623228 */ /* Deleting framebuffer 0 causes hangs on the DROID. See bug 623228 */
} else { } else {
mSymbols.fDeleteFramebuffers(n, names); mSymbols.fDeleteFramebuffers(n, names);
} }
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedFramebuffers(this, n, names)); TRACKING_CONTEXT(DeletedFramebuffers(this, n, names));
} }
void GLAPIENTRY fDeleteRenderbuffers(GLsizei n, GLuint *names) { void GLAPIENTRY fDeleteRenderbuffers(GLsizei n, GLuint *names) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteRenderbuffers(n, names); mSymbols.fDeleteRenderbuffers(n, names);
AFTER_GL_CALL; AFTER_GL_CALL;
TRACKING_CONTEXT(DeletedRenderbuffers(this, n, names)); TRACKING_CONTEXT(DeletedRenderbuffers(this, n, names));
} }
GLenum GLAPIENTRY fGetGraphicsResetStatus() {
BEFORE_GL_CALL;
GLenum ret = mHasRobustness ? mSymbols.fGetGraphicsResetStatus() : 0;
AFTER_GL_CALL;
return ret;
}
GLsync GLAPIENTRY fFenceSync(GLenum condition, GLbitfield flags) { GLenum GLAPIENTRY fGetGraphicsResetStatus() {
BEFORE_GL_CALL; BEFORE_GL_CALL;
GLsync ret = mSymbols.fFenceSync(condition, flags); GLenum ret = mHasRobustness ? mSymbols.fGetGraphicsResetStatus() : 0;
AFTER_GL_CALL; AFTER_GL_CALL;
return ret; return ret;
} }
realGLboolean GLAPIENTRY fIsSync(GLsync sync) { GLsync GLAPIENTRY fFenceSync(GLenum condition, GLbitfield flags) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
realGLboolean ret = mSymbols.fIsSync(sync); GLsync ret = mSymbols.fFenceSync(condition, flags);
AFTER_GL_CALL; AFTER_GL_CALL;
return ret; return ret;
} }
void GLAPIENTRY fDeleteSync(GLsync sync) { realGLboolean GLAPIENTRY fIsSync(GLsync sync) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fDeleteSync(sync); realGLboolean ret = mSymbols.fIsSync(sync);
AFTER_GL_CALL; AFTER_GL_CALL;
} return ret;
}
GLenum GLAPIENTRY fClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) { void GLAPIENTRY fDeleteSync(GLsync sync) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
GLenum ret = mSymbols.fClientWaitSync(sync, flags, timeout); mSymbols.fDeleteSync(sync);
AFTER_GL_CALL; AFTER_GL_CALL;
return ret; }
}
void GLAPIENTRY fWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) { GLenum GLAPIENTRY fClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fWaitSync(sync, flags, timeout); GLenum ret = mSymbols.fClientWaitSync(sync, flags, timeout);
AFTER_GL_CALL; AFTER_GL_CALL;
} return ret;
}
void GLAPIENTRY fGetInteger64v(GLenum pname, GLint64 *params) { void GLAPIENTRY fWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGetInteger64v(pname, params); mSymbols.fWaitSync(sync, flags, timeout);
AFTER_GL_CALL; AFTER_GL_CALL;
} }
void GLAPIENTRY fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) { void GLAPIENTRY fGetInteger64v(GLenum pname, GLint64 *params) {
BEFORE_GL_CALL; BEFORE_GL_CALL;
mSymbols.fGetSynciv(sync, pname, bufSize, length, values); mSymbols.fGetInteger64v(pname, params);
AFTER_GL_CALL; AFTER_GL_CALL;
} }
// OES_EGL_image (GLES) void GLAPIENTRY fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) {
void fEGLImageTargetTexture2D(GLenum target, GLeglImage image) BEFORE_GL_CALL;
{ mSymbols.fGetSynciv(sync, pname, bufSize, length, values);
BEFORE_GL_CALL; AFTER_GL_CALL;
mSymbols.fEGLImageTargetTexture2D(target, image); }
AFTER_GL_CALL;
} // OES_EGL_image (GLES)
void fEGLImageTargetTexture2D(GLenum target, GLeglImage image)
{
BEFORE_GL_CALL;
mSymbols.fEGLImageTargetTexture2D(target, image);
AFTER_GL_CALL;
}
#ifdef DEBUG #ifdef DEBUG
void THEBES_API CreatedProgram(GLContext *aOrigin, GLuint aName); void THEBES_API CreatedProgram(GLContext *aOrigin, GLuint aName);