mesa: whitespace and comment fixes in fbobject.c
This commit is contained in:
@@ -819,7 +819,7 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
|
||||
fbo_incomplete("width or height mismatch", -1);
|
||||
return;
|
||||
}
|
||||
/* check that all color buffer have same format */
|
||||
/* check that all color buffers are the same format */
|
||||
if (intFormat != GL_NONE && f != intFormat) {
|
||||
fb->_Status = GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT;
|
||||
fbo_incomplete("format mismatch", -1);
|
||||
@@ -832,7 +832,6 @@ _mesa_test_framebuffer_completeness(struct gl_context *ctx,
|
||||
fbo_incomplete("inconsistant number of samples", i);
|
||||
return;
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1897,6 +1896,7 @@ _mesa_CheckFramebufferStatusEXT(GLenum target)
|
||||
return buffer->_Status;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Replicate the src attachment point. Used by framebuffer_texture() when
|
||||
* the same texture is attached at GL_DEPTH_ATTACHMENT and
|
||||
@@ -1911,7 +1911,7 @@ reuse_framebuffer_texture_attachment(struct gl_framebuffer *fb,
|
||||
struct gl_renderbuffer_attachment *src_att = &fb->Attachment[src];
|
||||
|
||||
assert(src_att->Texture != NULL);
|
||||
assert (src_att->Renderbuffer != NULL);
|
||||
assert(src_att->Renderbuffer != NULL);
|
||||
|
||||
_mesa_reference_texobj(&dst_att->Texture, src_att->Texture);
|
||||
_mesa_reference_renderbuffer(&dst_att->Renderbuffer, src_att->Renderbuffer);
|
||||
@@ -1921,6 +1921,7 @@ reuse_framebuffer_texture_attachment(struct gl_framebuffer *fb,
|
||||
dst_att->Zoffset = src_att->Zoffset;
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Common code called by glFramebufferTexture1D/2D/3DEXT().
|
||||
*/
|
||||
@@ -1949,7 +1950,6 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
/* The textarget, level, and zoffset parameters are only validated if
|
||||
* texture is non-zero.
|
||||
*/
|
||||
@@ -2031,7 +2031,7 @@ framebuffer_texture(struct gl_context *ctx, const char *caller, GLenum target,
|
||||
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) {
|
||||
/* As above, but with depth and stencil juxtasposed. */
|
||||
reuse_framebuffer_texture_attachment(fb, BUFFER_STENCIL,
|
||||
BUFFER_DEPTH);
|
||||
@@ -2797,6 +2797,7 @@ _mesa_BlitFramebufferEXT(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1,
|
||||
}
|
||||
#endif /* FEATURE_EXT_framebuffer_blit */
|
||||
|
||||
|
||||
#if FEATURE_ARB_geometry_shader4
|
||||
void GLAPIENTRY
|
||||
_mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
|
||||
@@ -2808,6 +2809,7 @@ _mesa_FramebufferTextureARB(GLenum target, GLenum attachment,
|
||||
"not implemented!");
|
||||
}
|
||||
|
||||
|
||||
void GLAPIENTRY
|
||||
_mesa_FramebufferTextureFaceARB(GLenum target, GLenum attachment,
|
||||
GLuint texture, GLint level, GLenum face)
|
||||
|
Reference in New Issue
Block a user