Mesa (master): r600g: r600_blit_uncompress_depth() can't fail.

Henri Verbeet hverbeet at kemper.freedesktop.org
Fri Dec 24 10:41:49 UTC 2010


Module: Mesa
Branch: master
Commit: 8fc6c5fb3684ba3f4a8810b8db09540de1187782
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8fc6c5fb3684ba3f4a8810b8db09540de1187782

Author: Henri Verbeet <hverbeet at gmail.com>
Date:   Fri Dec 24 11:36:50 2010 +0100

r600g: r600_blit_uncompress_depth() can't fail.

---

 src/gallium/drivers/r600/r600_blit.c |    5 +----
 src/gallium/drivers/r600/r600_pipe.h |    2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c
index 0f04136..b9ec959 100644
--- a/src/gallium/drivers/r600/r600_blit.c
+++ b/src/gallium/drivers/r600/r600_blit.c
@@ -78,7 +78,7 @@ static void r600_blitter_end(struct pipe_context *ctx)
 	r600_context_queries_resume(&rctx->ctx);
 }
 
-int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture)
+void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture)
 {
 	struct r600_pipe_context *rctx = (struct r600_pipe_context *)ctx;
 	struct pipe_surface *zsurf, *cbsurf, surf_tmpl;
@@ -107,9 +107,6 @@ int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_te
 
 	pipe_surface_reference(&zsurf, NULL);
 	pipe_surface_reference(&cbsurf, NULL);
-
-
-	return 0;
 }
 
 static void r600_clear(struct pipe_context *ctx, unsigned buffers,
diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h
index d9c35a4..1cdca9c 100644
--- a/src/gallium/drivers/r600/r600_pipe.h
+++ b/src/gallium/drivers/r600/r600_pipe.h
@@ -196,7 +196,7 @@ void evergreen_vertex_buffer_update(struct r600_pipe_context *rctx);
 
 /* r600_blit.c */
 void r600_init_blit_functions(struct r600_pipe_context *rctx);
-int r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture);
+void r600_blit_uncompress_depth(struct pipe_context *ctx, struct r600_resource_texture *texture);
 
 /* r600_buffer.c */
 struct pipe_resource *r600_buffer_create(struct pipe_screen *screen,




More information about the mesa-commit mailing list