r600g: fix warnings for htile va

This fixes a warning about mismatched types.

Signed-off-by: Dave Airlie <airlied@redhat.com>

diff --git a/src/gallium/drivers/r600/evergreen_state.c b/src/gallium/drivers/r600/evergreen_state.c
index 7040b7aa8cb21fd017b712476b50b0d14b940d95..1d491535bd227fa025ef15efccaf633c0e9b79a1 100644 (file)
--- 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 17c5a64e9e7774b9ba1d76299249e237f13095b6..3ec21d20ef8e8d16d1351f8981b2f7d4f3431283 100644 (file)
--- 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) |