radeonsi: rename r600_surface -> si_surface

Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>

diff --git a/src/gallium/drivers/radeonsi/si_blit.c b/src/gallium/drivers/radeonsi/si_blit.c
index 9024717791ce738dd933401c8516dd28260ed9ce..7cb8191e2c525541a1f88df493f172ac176ee552 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_blit.c
+++ b/src/gallium/drivers/radeonsi/si_blit.c
@@ -605,12 +605,12 @@ static void si_check_render_feedback_texture(struct si_context *sctx,
                return;
 
        for (unsigned j = 0; j < sctx->framebuffer.state.nr_cbufs; ++j) {
-               struct r600_surface * surf;
+               struct si_surface * surf;
 
                if (!sctx->framebuffer.state.cbufs[j])
                        continue;
 
-               surf = (struct r600_surface*)sctx->framebuffer.state.cbufs[j];
+               surf = (struct si_surface*)sctx->framebuffer.state.cbufs[j];
 
                if (tex == (struct si_texture *)surf->base.texture &&
                    surf->base.u.tex.level >= first_level &&

diff --git a/src/gallium/drivers/radeonsi/si_pipe.h b/src/gallium/drivers/radeonsi/si_pipe.h
index 629310a685df66985b1892daf973030e555db959..ddd1dfbf76244af19f414e4c622c86acd18bf17c 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_pipe.h
+++ b/src/gallium/drivers/radeonsi/si_pipe.h
@@ -305,7 +305,7 @@ struct si_texture {
        unsigned                        num_slow_clears;
 };
 
-struct r600_surface {
+struct si_surface {
        struct pipe_surface             base;
 
        /* These can vary with block-compressed textures. */

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index a7377f387453f04c76b7f2563a112fc22a194391..e23666b40197a0ebb7b64ac2e35279cca8075bdb 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -130,8 +130,8 @@ static void si_emit_cb_render_state(struct si_context *sctx)
                unsigned sx_blend_opt_control = 0;
 
                for (i = 0; i < sctx->framebuffer.state.nr_cbufs; i++) {
-                       struct r600_surface *surf =
-                               (struct r600_surface*)sctx->framebuffer.state.cbufs[i];
+                       struct si_surface *surf =
+                               (struct si_surface*)sctx->framebuffer.state.cbufs[i];
                        unsigned format, swap, spi_format, colormask;
                        bool has_alpha, has_rgb;
 
@@ -2222,7 +2222,7 @@ static boolean si_is_format_supported(struct pipe_screen *screen,
  * framebuffer handling
  */
 
-static void si_choose_spi_color_formats(struct r600_surface *surf,
+static void si_choose_spi_color_formats(struct si_surface *surf,
                                        unsigned format, unsigned swap,
                                        unsigned ntype, bool is_depth)
 {
@@ -2340,7 +2340,7 @@ static void si_choose_spi_color_formats(struct r600_surface *surf,
 }
 
 static void si_initialize_color_surface(struct si_context *sctx,
-                                       struct r600_surface *surf)
+                                       struct si_surface *surf)
 {
        struct si_texture *tex = (struct si_texture*)surf->base.texture;
        unsigned color_info, color_attrib;
@@ -2500,7 +2500,7 @@ static void si_initialize_color_surface(struct si_context *sctx,
 }
 
 static void si_init_depth_surface(struct si_context *sctx,
-                                 struct r600_surface *surf)
+                                 struct si_surface *surf)
 {
        struct si_texture *tex = (struct si_texture*)surf->base.texture;
        unsigned level = surf->base.u.tex.level;
@@ -2696,12 +2696,12 @@ void si_update_fb_dirtiness_after_rendering(struct si_context *sctx)
 static void si_dec_framebuffer_counters(const struct pipe_framebuffer_state *state)
 {
        for (int i = 0; i < state->nr_cbufs; ++i) {
-               struct r600_surface *surf = NULL;
+               struct si_surface *surf = NULL;
                struct si_texture *tex;
 
                if (!state->cbufs[i])
                        continue;
-               surf = (struct r600_surface*)state->cbufs[i];
+               surf = (struct si_surface*)state->cbufs[i];
                tex = (struct si_texture*)surf->base.texture;
 
                p_atomic_dec(&tex->framebuffers_bound);
@@ -2713,7 +2713,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
 {
        struct si_context *sctx = (struct si_context *)ctx;
        struct pipe_constant_buffer constbuf = {0};
-       struct r600_surface *surf = NULL;
+       struct si_surface *surf = NULL;
        struct si_texture *tex;
        bool old_any_dst_linear = sctx->framebuffer.any_dst_linear;
        unsigned old_nr_samples = sctx->framebuffer.nr_samples;
@@ -2741,7 +2741,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                if (!state->cbufs[i])
                        continue;
 
-               surf = (struct r600_surface*)state->cbufs[i];
+               surf = (struct si_surface*)state->cbufs[i];
                tex = (struct si_texture*)surf->base.texture;
 
                if (!surf->dcc_incompatible)
@@ -2837,7 +2837,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
                if (!state->cbufs[i])
                        continue;
 
-               surf = (struct r600_surface*)state->cbufs[i];
+               surf = (struct si_surface*)state->cbufs[i];
                tex = (struct si_texture*)surf->base.texture;
 
                if (!surf->color_initialized) {
@@ -2894,7 +2894,7 @@ static void si_set_framebuffer_state(struct pipe_context *ctx,
        struct si_texture *zstex = NULL;
 
        if (state->zsbuf) {
-               surf = (struct r600_surface*)state->zsbuf;
+               surf = (struct si_surface*)state->zsbuf;
                zstex = (struct si_texture*)surf->base.texture;
 
                if (!surf->depth_initialized) {
@@ -2972,7 +2972,7 @@ static void si_emit_framebuffer_state(struct si_context *sctx)
        struct pipe_framebuffer_state *state = &sctx->framebuffer.state;
        unsigned i, nr_cbufs = state->nr_cbufs;
        struct si_texture *tex = NULL;
-       struct r600_surface *cb = NULL;
+       struct si_surface *cb = NULL;
        unsigned cb_color_info = 0;
 
        /* Colorbuffers. */
@@ -2983,7 +2983,7 @@ static void si_emit_framebuffer_state(struct si_context *sctx)
                if (!(sctx->framebuffer.dirty_cbufs & (1 << i)))
                        continue;
 
-               cb = (struct r600_surface*)state->cbufs[i];
+               cb = (struct si_surface*)state->cbufs[i];
                if (!cb) {
                        radeon_set_context_reg(cs, R_028C70_CB_COLOR0_INFO + i * 0x3C,
                                               S_028C70_FORMAT(V_028C70_COLOR_INVALID));
@@ -3146,7 +3146,7 @@ static void si_emit_framebuffer_state(struct si_context *sctx)
 
        /* ZS buffer. */
        if (state->zsbuf && sctx->framebuffer.dirty_zsbuf) {
-               struct r600_surface *zb = (struct r600_surface*)state->zsbuf;
+               struct si_surface *zb = (struct si_surface*)state->zsbuf;
                struct si_texture *tex = (struct si_texture*)zb->base.texture;
 
                radeon_add_to_buffer_list(sctx, sctx->gfx_cs,

diff --git a/src/gallium/drivers/radeonsi/si_texture.c b/src/gallium/drivers/radeonsi/si_texture.c
index cba758aec2ee967be8bb622950e81f54ca71324b..cb6cf196148dee2a45368fca00e8a4ade440aef7 100644 (file)
--- a/src/gallium/drivers/radeonsi/si_texture.c
+++ b/src/gallium/drivers/radeonsi/si_texture.c
@@ -2019,7 +2019,7 @@ struct pipe_surface *si_create_surface_custom(struct pipe_context *pipe,
                                              unsigned width0, unsigned height0,
                                              unsigned width, unsigned height)
 {
-       struct r600_surface *surface = CALLOC_STRUCT(r600_surface);
+       struct si_surface *surface = CALLOC_STRUCT(si_surface);
 
        if (!surface)
                return NULL;