Module: Mesa Branch: master Commit: 5039ad6bc5cec5c49f01380aa270248aae77811e URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5039ad6bc5cec5c49f01380aa270248aae77811e
Author: Dave Airlie <[email protected]> Date: Fri Jan 11 23:19:11 2013 +0000 r600g: fix warnings for htile va This fixes a warning about mismatched types. Signed-off-by: Dave Airlie <[email protected]> --- src/gallium/drivers/r600/evergreen_state.c | 2 +- src/gallium/drivers/r600/r600_state.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c index 7040b7aa..1d49153 100644 --- a/src/gallium/drivers/r600/evergreen_state.c +++ b/src/gallium/drivers/r600/evergreen_state.c @@ -1603,7 +1603,7 @@ static void evergreen_init_depth_surface(struct r600_context *rctx, surf->htile_enabled = 0; /* use htile only for first level */ if (rtex->htile && !level) { - uint64_t va = r600_resource_va(rctx->screen, rtex->htile); + uint64_t va = r600_resource_va(&rctx->screen->screen, &rtex->htile->b.b); surf->htile_enabled = 1; surf->db_htile_data_base = va >> 8; surf->db_htile_surface = S_028ABC_HTILE_WIDTH(1) | diff --git a/src/gallium/drivers/r600/r600_state.c b/src/gallium/drivers/r600/r600_state.c index 17c5a64..3ec21d2 100644 --- a/src/gallium/drivers/r600/r600_state.c +++ b/src/gallium/drivers/r600/r600_state.c @@ -1486,7 +1486,7 @@ static void r600_init_depth_surface(struct r600_context *rctx, surf->htile_enabled = 0; /* use htile only for first level */ if (rtex->htile && !level) { - uint64_t va = r600_resource_va(rctx->screen, rtex->htile); + uint64_t va = r600_resource_va(&rctx->screen->screen, &rtex->htile->b.b); surf->htile_enabled = 1; surf->db_htile_data_base = va >> 8; surf->db_htile_surface = S_028D24_HTILE_WIDTH(1) | _______________________________________________ mesa-commit mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/mesa-commit
