main: replace tabs by 8 spaces in fbobject.c
authorMartin Peres <martin.peres@linux.intel.com>
Thu, 12 Feb 2015 15:54:43 +0000 (17:54 +0200)
committerMartin Peres <martin.peres@linux.intel.com>
Wed, 25 Mar 2015 08:05:45 +0000 (10:05 +0200)
Reviewed-by: Laura Ekstrand <laura@jlekstrand.net>
Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
src/mesa/main/fbobject.c

index f8d0d92bfb784a293e8da329d23aec9273b9bb0f..bccac91c634a008a1ba3ba20633731c65f75165c 100644 (file)
@@ -212,13 +212,13 @@ get_attachment(struct gl_context *ctx, struct gl_framebuffer *fb,
        */
       i = attachment - GL_COLOR_ATTACHMENT0_EXT;
       if (i >= ctx->Const.MaxColorAttachments
-         || (i > 0 && ctx->API == API_OPENGLES)) {
-        return NULL;
+          || (i > 0 && ctx->API == API_OPENGLES)) {
+         return NULL;
       }
       return &fb->Attachment[BUFFER_COLOR0 + i];
    case GL_DEPTH_STENCIL_ATTACHMENT:
       if (!_mesa_is_desktop_gl(ctx) && !_mesa_is_gles3(ctx))
-        return NULL;
+         return NULL;
       /* fall-through */
    case GL_DEPTH_ATTACHMENT_EXT:
       return &fb->Attachment[BUFFER_DEPTH];
@@ -1122,28 +1122,28 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
    if (_mesa_is_desktop_gl(ctx) && !ctx->Extensions.ARB_ES2_compatibility) {
       /* Check that all DrawBuffers are present */
       for (j = 0; j < ctx->Const.MaxDrawBuffers; j++) {
-        if (fb->ColorDrawBuffer[j] != GL_NONE) {
-           const struct gl_renderbuffer_attachment *att
-              = get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);
-           assert(att);
-           if (att->Type == GL_NONE) {
-              fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
-              fbo_incomplete(ctx, "missing drawbuffer", j);
-              return;
-           }
-        }
+         if (fb->ColorDrawBuffer[j] != GL_NONE) {
+            const struct gl_renderbuffer_attachment *att
+               = get_attachment(ctx, fb, fb->ColorDrawBuffer[j]);
+            assert(att);
+            if (att->Type == GL_NONE) {
+               fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT;
+               fbo_incomplete(ctx, "missing drawbuffer", j);
+               return;
+            }
+         }
       }
 
       /* Check that the ReadBuffer is present */
       if (fb->ColorReadBuffer != GL_NONE) {
-        const struct gl_renderbuffer_attachment *att
-           = get_attachment(ctx, fb, fb->ColorReadBuffer);
-        assert(att);
-        if (att->Type == GL_NONE) {
-           fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
+         const struct gl_renderbuffer_attachment *att
+            = get_attachment(ctx, fb, fb->ColorReadBuffer);
+         assert(att);
+         if (att->Type == GL_NONE) {
+            fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT;
             fbo_incomplete(ctx, "missing readbuffer", -1);
-           return;
-        }
+            return;
+         }
       }
    }
 
@@ -1233,12 +1233,12 @@ bind_renderbuffer(GLenum target, GLuint renderbuffer, bool allow_user_names)
       }
 
       if (!newRb) {
-        /* create new renderbuffer object */
-        newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);
-        if (!newRb) {
-           _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindRenderbufferEXT");
-           return;
-        }
+         /* create new renderbuffer object */
+         newRb = ctx->Driver.NewRenderbuffer(ctx, renderbuffer);
+         if (!newRb) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindRenderbufferEXT");
+            return;
+         }
          assert(newRb->AllocStorage);
          _mesa_HashInsert(ctx->Shared->RenderBuffers, renderbuffer, newRb);
          newRb->RefCount = 1; /* referenced by hash table */
@@ -1333,9 +1333,9 @@ _mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
 
    for (i = 0; i < n; i++) {
       if (renderbuffers[i] > 0) {
-        struct gl_renderbuffer *rb;
-        rb = _mesa_lookup_renderbuffer(ctx, renderbuffers[i]);
-        if (rb) {
+         struct gl_renderbuffer *rb;
+         rb = _mesa_lookup_renderbuffer(ctx, renderbuffers[i]);
+         if (rb) {
             /* check if deleting currently bound renderbuffer object */
             if (rb == ctx->CurrentRenderbuffer) {
                /* bind default */
@@ -1368,17 +1368,17 @@ _mesa_DeleteRenderbuffers(GLsizei n, const GLuint *renderbuffers)
                _mesa_detach_renderbuffer(ctx, ctx->ReadBuffer, rb);
             }
 
-           /* Remove from hash table immediately, to free the ID.
+            /* Remove from hash table immediately, to free the ID.
              * But the object will not be freed until it's no longer
              * referenced anywhere else.
              */
-           _mesa_HashRemove(ctx->Shared->RenderBuffers, renderbuffers[i]);
+            _mesa_HashRemove(ctx->Shared->RenderBuffers, renderbuffers[i]);
 
             if (rb != &DummyRenderbuffer) {
                /* no longer referenced by hash table */
                _mesa_reference_renderbuffer(&rb, NULL);
-           }
-        }
+            }
+         }
       }
    }
 }
@@ -1941,7 +1941,7 @@ _mesa_RenderbufferStorageMultisample(GLenum target, GLsizei samples,
  */
 void GLAPIENTRY
 _es_RenderbufferStorageEXT(GLenum target, GLenum internalFormat,
-                          GLsizei width, GLsizei height)
+                           GLsizei width, GLsizei height)
 {
    switch (internalFormat) {
    case GL_RGB565:
@@ -2116,12 +2116,12 @@ bind_framebuffer(GLenum target, GLuint framebuffer, bool allow_user_names)
       }
 
       if (!newDrawFb) {
-        /* create new framebuffer object */
-        newDrawFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
-        if (!newDrawFb) {
-           _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
-           return;
-        }
+         /* create new framebuffer object */
+         newDrawFb = ctx->Driver.NewFramebuffer(ctx, framebuffer);
+         if (!newDrawFb) {
+            _mesa_error(ctx, GL_OUT_OF_MEMORY, "glBindFramebufferEXT");
+            return;
+         }
          _mesa_HashInsert(ctx->Shared->FrameBuffers, framebuffer, newDrawFb);
       }
       newReadFb = newDrawFb;
@@ -2224,9 +2224,9 @@ _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
 
    for (i = 0; i < n; i++) {
       if (framebuffers[i] > 0) {
-        struct gl_framebuffer *fb;
-        fb = _mesa_lookup_framebuffer(ctx, framebuffers[i]);
-        if (fb) {
+         struct gl_framebuffer *fb;
+         fb = _mesa_lookup_framebuffer(ctx, framebuffers[i]);
+         if (fb) {
             assert(fb == &DummyFramebuffer || fb->Name == framebuffers[i]);
 
             /* check if deleting currently bound framebuffer object */
@@ -2241,16 +2241,16 @@ _mesa_DeleteFramebuffers(GLsizei n, const GLuint *framebuffers)
                _mesa_BindFramebuffer(GL_READ_FRAMEBUFFER, 0);
             }
 
-           /* remove from hash table immediately, to free the ID */
-           _mesa_HashRemove(ctx->Shared->FrameBuffers, framebuffers[i]);
+            /* remove from hash table immediately, to free the ID */
+            _mesa_HashRemove(ctx->Shared->FrameBuffers, framebuffers[i]);
 
             if (fb != &DummyFramebuffer) {
                /* But the object will not be freed until it's no longer
                 * bound in any context.
                 */
                _mesa_reference_framebuffer(&fb, NULL);
-           }
-        }
+            }
+         }
       }
    }
 }
@@ -2498,34 +2498,34 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
           _mesa_tex_target_to_face(textarget) ==
           fb->Attachment[BUFFER_STENCIL].CubeMapFace &&
           zoffset == fb->Attachment[BUFFER_STENCIL].Zoffset) {
-        /* The texture object is already attached to the stencil attachment
-         * point. Don't create a new renderbuffer; just reuse the stencil
-         * attachment's. This is required to prevent a GL error in
-         * glGetFramebufferAttachmentParameteriv(GL_DEPTH_STENCIL).
-         */
-        reuse_framebuffer_texture_attachment(fb, BUFFER_DEPTH,
-                                             BUFFER_STENCIL);
+         /* The texture object is already attached to the stencil attachment
+          * point. Don't create a new renderbuffer; just reuse the stencil
+          * attachment's. This is required to prevent a GL error in
+          * glGetFramebufferAttachmentParameteriv(GL_DEPTH_STENCIL).
+          */
+         reuse_framebuffer_texture_attachment(fb, BUFFER_DEPTH,
+                                              BUFFER_STENCIL);
       } else if (attachment == GL_STENCIL_ATTACHMENT &&
-                texObj == fb->Attachment[BUFFER_DEPTH].Texture &&
+                 texObj == fb->Attachment[BUFFER_DEPTH].Texture &&
                  level == fb->Attachment[BUFFER_DEPTH].TextureLevel &&
                  _mesa_tex_target_to_face(textarget) ==
                  fb->Attachment[BUFFER_DEPTH].CubeMapFace &&
                  zoffset == fb->Attachment[BUFFER_DEPTH].Zoffset) {
-        /* As above, but with depth and stencil transposed. */
-        reuse_framebuffer_texture_attachment(fb, BUFFER_STENCIL,
-                                             BUFFER_DEPTH);
+         /* As above, but with depth and stencil transposed. */
+         reuse_framebuffer_texture_attachment(fb, BUFFER_STENCIL,
+                                              BUFFER_DEPTH);
       } else {
-        set_texture_attachment(ctx, fb, att, texObj, textarget,
-                                     level, zoffset, layered);
-        if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-           /* Above we created a new renderbuffer and attached it to the
-            * depth attachment point. Now attach it to the stencil attachment
-            * point too.
-            */
-           assert(att == &fb->Attachment[BUFFER_DEPTH]);
-           reuse_framebuffer_texture_attachment(fb,BUFFER_STENCIL,
-                                                BUFFER_DEPTH);
-        }
+         set_texture_attachment(ctx, fb, att, texObj, textarget,
+                                      level, zoffset, layered);
+         if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
+            /* Above we created a new renderbuffer and attached it to the
+             * depth attachment point. Now attach it to the stencil attachment
+             * point too.
+             */
+            assert(att == &fb->Attachment[BUFFER_DEPTH]);
+            reuse_framebuffer_texture_attachment(fb,BUFFER_STENCIL,
+                                                 BUFFER_DEPTH);
+         }
       }
 
       /* Set the render-to-texture flag.  We'll check this flag in
@@ -2541,8 +2541,8 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
    else {
       remove_attachment(ctx, att);
       if (attachment == GL_DEPTH_STENCIL_ATTACHMENT) {
-        assert(att == &fb->Attachment[BUFFER_DEPTH]);
-        remove_attachment(ctx, &fb->Attachment[BUFFER_STENCIL]);
+         assert(att == &fb->Attachment[BUFFER_DEPTH]);
+         remove_attachment(ctx, &fb->Attachment[BUFFER_STENCIL]);
       }
    }
 
@@ -2721,16 +2721,16 @@ _mesa_FramebufferRenderbuffer(GLenum target, GLenum attachment,
    if (renderbuffer) {
       rb = _mesa_lookup_renderbuffer(ctx, renderbuffer);
       if (!rb) {
-        _mesa_error(ctx, GL_INVALID_OPERATION,
-                    "glFramebufferRenderbuffer(non-existant"
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferRenderbuffer(non-existant"
                      " renderbuffer %u)", renderbuffer);
-        return;
+         return;
       }
       else if (rb == &DummyRenderbuffer) {
-        _mesa_error(ctx, GL_INVALID_OPERATION,
-                    "glFramebufferRenderbuffer(renderbuffer %u)",
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glFramebufferRenderbuffer(renderbuffer %u)",
                      renderbuffer);
-        return;
+         return;
       }
    }
    else {
@@ -2795,9 +2795,9 @@ _mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
       if ((!_mesa_is_desktop_gl(ctx) ||
            !ctx->Extensions.ARB_framebuffer_object)
           && !_mesa_is_gles3(ctx)) {
-        _mesa_error(ctx, GL_INVALID_OPERATION,
-                    "glGetFramebufferAttachmentParameteriv(bound FBO = 0)");
-        return;
+         _mesa_error(ctx, GL_INVALID_OPERATION,
+                     "glGetFramebufferAttachmentParameteriv(bound FBO = 0)");
+         return;
       }
 
       if (_mesa_is_gles3(ctx) && attachment != GL_BACK &&
@@ -2855,10 +2855,10 @@ _mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT:
       if (att->Type == GL_RENDERBUFFER_EXT) {
-        *params = att->Renderbuffer->Name;
+         *params = att->Renderbuffer->Name;
       }
       else if (att->Type == GL_TEXTURE) {
-        *params = att->Texture->Name;
+         *params = att->Texture->Name;
       }
       else {
          assert(att->Type == GL_NONE);
@@ -2871,7 +2871,7 @@ _mesa_GetFramebufferAttachmentParameteriv(GLenum target, GLenum attachment,
       return;
    case GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT:
       if (att->Type == GL_TEXTURE) {
-        *params = att->TextureLevel;
+         *params = att->TextureLevel;
       }
       else if (att->Type == GL_NONE) {
          _mesa_error(ctx, err,