On Thu, Jun 23, 2016 at 02:00:21PM -0700, Jason Ekstrand wrote: > We're about to add generic versions which work across gens and those should > have the brw name. > --- > src/mesa/drivers/dri/i965/brw_wm_surface_state.c | 22 +++++++++++----------- > 1 file changed, 11 insertions(+), 11 deletions(-)
Reviewed-by: Topi Pohjolainen <topi.pohjolai...@intel.com> > > 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 d2bc3ba..c6bd26c 100644 > --- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > +++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c > @@ -371,11 +371,11 @@ brw_update_buffer_texture_surface(struct gl_context > *ctx, > } > > static void > -brw_update_texture_surface(struct gl_context *ctx, > - unsigned unit, > - uint32_t *surf_offset, > - bool for_gather, > - uint32_t plane) > +gen4_update_texture_surface(struct gl_context *ctx, > + unsigned unit, > + uint32_t *surf_offset, > + bool for_gather, > + uint32_t plane) > { > struct brw_context *brw = brw_context(ctx); > struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current; > @@ -721,10 +721,10 @@ brw_emit_null_surface_state(struct brw_context *brw, > * usable for further buffers when doing ARB_draw_buffer support. > */ > static uint32_t > -brw_update_renderbuffer_surface(struct brw_context *brw, > - struct gl_renderbuffer *rb, > - bool layered, unsigned unit, > - uint32_t surf_index) > +gen4_update_renderbuffer_surface(struct brw_context *brw, > + struct gl_renderbuffer *rb, > + bool layered, unsigned unit, > + uint32_t surf_index) > { > struct gl_context *ctx = &brw->ctx; > struct intel_renderbuffer *irb = intel_renderbuffer(rb); > @@ -1500,8 +1500,8 @@ const struct brw_tracked_state brw_wm_image_surfaces = { > void > gen4_init_vtable_surface_functions(struct brw_context *brw) > { > - brw->vtbl.update_texture_surface = brw_update_texture_surface; > - brw->vtbl.update_renderbuffer_surface = brw_update_renderbuffer_surface; > + brw->vtbl.update_texture_surface = gen4_update_texture_surface; > + brw->vtbl.update_renderbuffer_surface = gen4_update_renderbuffer_surface; > brw->vtbl.emit_null_surface_state = brw_emit_null_surface_state; > brw->vtbl.emit_buffer_surface_state = gen4_emit_buffer_surface_state; > } > -- > 2.5.0.400.gff86faf > > _______________________________________________ > mesa-dev mailing list > mesa-dev@lists.freedesktop.org > https://lists.freedesktop.org/mailman/listinfo/mesa-dev _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev