Bug 821191 - Fix mysterious 5-space indent region in GLContext.h - r=bjacob
authorJeff Gilbert <jgilbert@mozilla.com>
Mon, 17 Dec 2012 17:58:44 -0800
changeset 125474 d65f28340dd95357d07e15f94fa2fc67d695e5b0
parent 125473 664be99e44f62668138aea79a5f3a33ef103fb78
child 125475 79a8d91ba1cb87464ca887e3c016b8945e3a9977
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbjacob
bugs821191
milestone20.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 821191 - Fix mysterious 5-space indent region in GLContext.h - r=bjacob
gfx/gl/GLContext.h
--- a/gfx/gl/GLContext.h
+++ b/gfx/gl/GLContext.h
@@ -2694,177 +2694,178 @@ public:
         BEFORE_GL_CALL;
         realGLboolean ret = mSymbols.fUnmapBuffer(target);
         AFTER_GL_CALL;
         return ret;
     }
 
 
 #ifdef DEBUG
-     GLContext *TrackingContext() {
-         GLContext *tip = this;
-         while (tip->mSharedContext)
-             tip = tip->mSharedContext;
-         return tip;
-     }
+    GLContext *TrackingContext() {
+        GLContext *tip = this;
+        while (tip->mSharedContext)
+            tip = tip->mSharedContext;
+        return tip;
+    }
 
 #define TRACKING_CONTEXT(a) do { TrackingContext()->a; } while (0)
 #else
 #define TRACKING_CONTEXT(a) do {} while (0)
 #endif
 
-     GLuint GLAPIENTRY fCreateProgram() {
-         BEFORE_GL_CALL;
-         GLuint ret = mSymbols.fCreateProgram();
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedProgram(this, ret));
-         return ret;
-     }
-
-     GLuint GLAPIENTRY fCreateShader(GLenum t) {
-         BEFORE_GL_CALL;
-         GLuint ret = mSymbols.fCreateShader(t);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedShader(this, ret));
-         return ret;
-     }
-
-     void GLAPIENTRY fGenBuffers(GLsizei n, GLuint* names) {
-         BEFORE_GL_CALL;
-         mSymbols.fGenBuffers(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedBuffers(this, n, names));
-     }
-
-     void GLAPIENTRY fGenTextures(GLsizei n, GLuint* names) {
-         BEFORE_GL_CALL;
-         mSymbols.fGenTextures(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedTextures(this, n, names));
-     }
-
-     void GLAPIENTRY fGenFramebuffers(GLsizei n, GLuint* names) {
-         BEFORE_GL_CALL;
-         mSymbols.fGenFramebuffers(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedFramebuffers(this, n, names));
-     }
-
-     void GLAPIENTRY fGenRenderbuffers(GLsizei n, GLuint* names) {
-         BEFORE_GL_CALL;
-         mSymbols.fGenRenderbuffers(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(CreatedRenderbuffers(this, n, names));
-     }
-
-     void GLAPIENTRY fDeleteProgram(GLuint program) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteProgram(program);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(DeletedProgram(this, program));
-     }
-
-     void GLAPIENTRY fDeleteShader(GLuint shader) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteShader(shader);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(DeletedShader(this, shader));
-     }
-
-     void GLAPIENTRY fDeleteBuffers(GLsizei n, GLuint *names) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteBuffers(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(DeletedBuffers(this, n, names));
-     }
-
-     void GLAPIENTRY fDeleteTextures(GLsizei n, GLuint *names) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteTextures(n, names);
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(DeletedTextures(this, n, names));
-     }
-
-     void GLAPIENTRY fDeleteFramebuffers(GLsizei n, GLuint *names) {
-         BEFORE_GL_CALL;
-         if (n == 1 && *names == 0) {
-            /* Deleting framebuffer 0 causes hangs on the DROID. See bug 623228 */
-         } else {
-            mSymbols.fDeleteFramebuffers(n, names);
-         }
-         AFTER_GL_CALL;
-         TRACKING_CONTEXT(DeletedFramebuffers(this, n, names));
-     }
-
-     void GLAPIENTRY fDeleteRenderbuffers(GLsizei n, GLuint *names) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteRenderbuffers(n, names);
-         AFTER_GL_CALL;
-         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) {
-         BEFORE_GL_CALL;
-         GLsync ret = mSymbols.fFenceSync(condition, flags);
-         AFTER_GL_CALL;
-         return ret;
-     }
-
-     realGLboolean GLAPIENTRY fIsSync(GLsync sync) {
-         BEFORE_GL_CALL;
-         realGLboolean ret = mSymbols.fIsSync(sync);
-         AFTER_GL_CALL;
-         return ret;
-     }
-
-     void GLAPIENTRY fDeleteSync(GLsync sync) {
-         BEFORE_GL_CALL;
-         mSymbols.fDeleteSync(sync);
-         AFTER_GL_CALL;
-     }
-
-     GLenum GLAPIENTRY fClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
-         BEFORE_GL_CALL;
-         GLenum ret = mSymbols.fClientWaitSync(sync, flags, timeout);
-         AFTER_GL_CALL;
-         return ret;
-     }
-
-     void GLAPIENTRY fWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
-         BEFORE_GL_CALL;
-         mSymbols.fWaitSync(sync, flags, timeout);
-         AFTER_GL_CALL;
-     }
-
-     void GLAPIENTRY fGetInteger64v(GLenum pname, GLint64 *params) {
-         BEFORE_GL_CALL;
-         mSymbols.fGetInteger64v(pname, params);
-         AFTER_GL_CALL;
-     }
-
-     void GLAPIENTRY fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) {
-         BEFORE_GL_CALL;
-         mSymbols.fGetSynciv(sync, pname, bufSize, length, values);
-         AFTER_GL_CALL;
-     }
-
-     // OES_EGL_image (GLES)
-     void fEGLImageTargetTexture2D(GLenum target, GLeglImage image)
-     {
-         BEFORE_GL_CALL;
-         mSymbols.fEGLImageTargetTexture2D(target, image);
-         AFTER_GL_CALL;
-     }
+    GLuint GLAPIENTRY fCreateProgram() {
+        BEFORE_GL_CALL;
+        GLuint ret = mSymbols.fCreateProgram();
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedProgram(this, ret));
+        return ret;
+    }
+
+    GLuint GLAPIENTRY fCreateShader(GLenum t) {
+        BEFORE_GL_CALL;
+        GLuint ret = mSymbols.fCreateShader(t);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedShader(this, ret));
+        return ret;
+    }
+
+    void GLAPIENTRY fGenBuffers(GLsizei n, GLuint* names) {
+        BEFORE_GL_CALL;
+        mSymbols.fGenBuffers(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedBuffers(this, n, names));
+    }
+
+    void GLAPIENTRY fGenTextures(GLsizei n, GLuint* names) {
+        BEFORE_GL_CALL;
+        mSymbols.fGenTextures(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedTextures(this, n, names));
+    }
+
+    void GLAPIENTRY fGenFramebuffers(GLsizei n, GLuint* names) {
+        BEFORE_GL_CALL;
+        mSymbols.fGenFramebuffers(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedFramebuffers(this, n, names));
+    }
+
+    void GLAPIENTRY fGenRenderbuffers(GLsizei n, GLuint* names) {
+        BEFORE_GL_CALL;
+        mSymbols.fGenRenderbuffers(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(CreatedRenderbuffers(this, n, names));
+    }
+
+    void GLAPIENTRY fDeleteProgram(GLuint program) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteProgram(program);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(DeletedProgram(this, program));
+    }
+
+    void GLAPIENTRY fDeleteShader(GLuint shader) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteShader(shader);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(DeletedShader(this, shader));
+    }
+
+    void GLAPIENTRY fDeleteBuffers(GLsizei n, GLuint *names) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteBuffers(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(DeletedBuffers(this, n, names));
+    }
+
+    void GLAPIENTRY fDeleteTextures(GLsizei n, GLuint *names) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteTextures(n, names);
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(DeletedTextures(this, n, names));
+    }
+
+    void GLAPIENTRY fDeleteFramebuffers(GLsizei n, GLuint *names) {
+        BEFORE_GL_CALL;
+        if (n == 1 && *names == 0) {
+           /* Deleting framebuffer 0 causes hangs on the DROID. See bug 623228 */
+        } else {
+           mSymbols.fDeleteFramebuffers(n, names);
+        }
+        AFTER_GL_CALL;
+        TRACKING_CONTEXT(DeletedFramebuffers(this, n, names));
+    }
+
+    void GLAPIENTRY fDeleteRenderbuffers(GLsizei n, GLuint *names) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteRenderbuffers(n, names);
+        AFTER_GL_CALL;
+        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) {
+        BEFORE_GL_CALL;
+        GLsync ret = mSymbols.fFenceSync(condition, flags);
+        AFTER_GL_CALL;
+        return ret;
+    }
+
+    realGLboolean GLAPIENTRY fIsSync(GLsync sync) {
+        BEFORE_GL_CALL;
+        realGLboolean ret = mSymbols.fIsSync(sync);
+        AFTER_GL_CALL;
+        return ret;
+    }
+
+    void GLAPIENTRY fDeleteSync(GLsync sync) {
+        BEFORE_GL_CALL;
+        mSymbols.fDeleteSync(sync);
+        AFTER_GL_CALL;
+    }
+
+    GLenum GLAPIENTRY fClientWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
+        BEFORE_GL_CALL;
+        GLenum ret = mSymbols.fClientWaitSync(sync, flags, timeout);
+        AFTER_GL_CALL;
+        return ret;
+    }
+
+    void GLAPIENTRY fWaitSync(GLsync sync, GLbitfield flags, GLuint64 timeout) {
+        BEFORE_GL_CALL;
+        mSymbols.fWaitSync(sync, flags, timeout);
+        AFTER_GL_CALL;
+    }
+
+    void GLAPIENTRY fGetInteger64v(GLenum pname, GLint64 *params) {
+        BEFORE_GL_CALL;
+        mSymbols.fGetInteger64v(pname, params);
+        AFTER_GL_CALL;
+    }
+
+    void GLAPIENTRY fGetSynciv(GLsync sync, GLenum pname, GLsizei bufSize, GLsizei *length, GLint *values) {
+        BEFORE_GL_CALL;
+        mSymbols.fGetSynciv(sync, pname, bufSize, length, values);
+        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
     void THEBES_API CreatedProgram(GLContext *aOrigin, GLuint aName);
     void THEBES_API CreatedShader(GLContext *aOrigin, GLuint aName);
     void THEBES_API CreatedBuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames);
     void THEBES_API CreatedTextures(GLContext *aOrigin, GLsizei aCount, GLuint *aNames);
     void THEBES_API CreatedFramebuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames);
     void THEBES_API CreatedRenderbuffers(GLContext *aOrigin, GLsizei aCount, GLuint *aNames);