Mesa (master): r600g: fix warnings since last commit.
Dave Airlie
airlied at kemper.freedesktop.org
Thu Sep 23 06:04:42 UTC 2010
Module: Mesa
Branch: master
Commit: 6547a82df185e1786e2313cfc4eb254f0a59f5aa
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=6547a82df185e1786e2313cfc4eb254f0a59f5aa
Author: Dave Airlie <airlied at redhat.com>
Date: Thu Sep 23 16:02:54 2010 +1000
r600g: fix warnings since last commit.
---
src/gallium/drivers/r600/r600_texture.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index b0d3b28..16468c9 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -144,7 +144,7 @@ static void r600_texture_destroy(struct pipe_screen *screen,
struct radeon *radeon = (struct radeon *)screen->winsys;
if (rtex->flushed_depth_texture)
- pipe_resource_reference(&rtex->flushed_depth_texture, NULL);
+ pipe_resource_reference((struct pipe_resource **)&rtex->flushed_depth_texture, NULL);
if (resource->bo) {
radeon_ws_bo_reference(radeon, &resource->bo, NULL);
@@ -256,7 +256,7 @@ int r600_texture_depth_flush(struct pipe_context *ctx,
resource.bind |= PIPE_BIND_RENDER_TARGET;
- rtex->flushed_depth_texture = ctx->screen->resource_create(ctx->screen, &resource);
+ rtex->flushed_depth_texture = (struct r600_resource_texture *)ctx->screen->resource_create(ctx->screen, &resource);
if (rtex->flushed_depth_texture == NULL) {
R600_ERR("failed to create temporary texture to hold untiled copy\n");
return -ENOMEM;
@@ -348,7 +348,7 @@ void r600_texture_transfer_destroy(struct pipe_context *ctx,
if (transfer->usage & PIPE_TRANSFER_WRITE) {
// TODO
}
- pipe_resource_reference(&rtex->flushed_depth_texture, NULL);
+ pipe_resource_reference((struct pipe_resource **)&rtex->flushed_depth_texture, NULL);
}
pipe_resource_reference(&transfer->resource, NULL);
FREE(transfer);
More information about the mesa-commit
mailing list