From f70e0f52c98e4cfbca4e8ad181d18357e81521eb Mon Sep 17 00:00:00 2001 From: Kenneth Graunke Date: Thu, 17 Aug 2017 00:57:33 -0700 Subject: [PATCH] i965: Make brw_update_renderbuffer_surface static. Also rename it to gen6_update_renderbuffer_surface, as this is the function for Gen6+. Having functions named "brw_*" and "gen4_*" is confusing...if we're using gens, let's stick with those. Reviewed-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/brw_state.h | 5 ----- src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 12 ++++++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_state.h b/src/mesa/drivers/dri/i965/brw_state.h index dc893e5b7bd..b3196427840 100644 --- a/src/mesa/drivers/dri/i965/brw_state.h +++ b/src/mesa/drivers/dri/i965/brw_state.h @@ -222,11 +222,6 @@ void brw_update_texture_surface(struct gl_context *ctx, unsigned unit, uint32_t *surf_offset, bool for_gather, uint32_t plane); -uint32_t brw_update_renderbuffer_surface(struct brw_context *brw, - struct gl_renderbuffer *rb, - uint32_t flags, unsigned unit, - uint32_t surf_index); - void brw_update_renderbuffer_surfaces(struct brw_context *brw, const struct gl_framebuffer *fb, uint32_t render_target_start, diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c index 358fdb48d44..8d6330032f9 100644 --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c @@ -206,11 +206,11 @@ brw_emit_surface_state(struct brw_context *brw, } } -uint32_t -brw_update_renderbuffer_surface(struct brw_context *brw, - struct gl_renderbuffer *rb, - uint32_t flags, unsigned unit, - uint32_t surf_index) +static uint32_t +gen6_update_renderbuffer_surface(struct brw_context *brw, + struct gl_renderbuffer *rb, + uint32_t flags, unsigned unit, + uint32_t surf_index) { struct gl_context *ctx = &brw->ctx; struct intel_renderbuffer *irb = intel_renderbuffer(rb); @@ -1695,7 +1695,7 @@ void gen6_init_vtable_surface_functions(struct brw_context *brw) { gen4_init_vtable_surface_functions(brw); - brw->vtbl.update_renderbuffer_surface = brw_update_renderbuffer_surface; + brw->vtbl.update_renderbuffer_surface = gen6_update_renderbuffer_surface; } static void -- 2.30.2