From d993ada50cf2f112bfff2bd7fbb5a6c25ca00306 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Sat, 8 Feb 2014 09:51:14 -0800 Subject: svga: update svga_winsys interface for GBS This adds new interface functions for guest-backed surfaces and adds a mobid parameter to the surface_relocation() function. Reviewed-by: Thomas Hellstrom Cc: "10.1" --- src/gallium/drivers/svga/svga_cmd.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/svga/svga_cmd.c') diff --git a/src/gallium/drivers/svga/svga_cmd.c b/src/gallium/drivers/svga/svga_cmd.c index 542bd129a89..6155e85fc12 100644 --- a/src/gallium/drivers/svga/svga_cmd.c +++ b/src/gallium/drivers/svga/svga_cmd.c @@ -62,12 +62,12 @@ surface_to_surfaceid(struct svga_winsys_context *swc, // IN { if (surface) { struct svga_surface *s = svga_surface(surface); - swc->surface_relocation(swc, &id->sid, s->handle, flags); + swc->surface_relocation(swc, &id->sid, NULL, s->handle, flags); id->face = s->real_face; /* faces have the same order */ id->mipmap = s->real_level; } else { - swc->surface_relocation(swc, &id->sid, NULL, flags); + swc->surface_relocation(swc, &id->sid, NULL, NULL, flags); id->face = 0; id->mipmap = 0; } @@ -280,7 +280,7 @@ SVGA3D_BeginDefineSurface(struct svga_winsys_context *swc, if (!cmd) return PIPE_ERROR_OUT_OF_MEMORY; - swc->surface_relocation(swc, &cmd->sid, sid, SVGA_RELOC_WRITE); + swc->surface_relocation(swc, &cmd->sid, NULL, sid, SVGA_RELOC_WRITE); cmd->surfaceFlags = flags; cmd->format = format; @@ -366,7 +366,7 @@ SVGA3D_DestroySurface(struct svga_winsys_context *swc, if (!cmd) return PIPE_ERROR_OUT_OF_MEMORY; - swc->surface_relocation(swc, &cmd->sid, sid, SVGA_RELOC_READ); + swc->surface_relocation(swc, &cmd->sid, NULL, sid, SVGA_RELOC_READ); swc->commit(swc);; return PIPE_OK; @@ -453,7 +453,8 @@ SVGA3D_SurfaceDMA(struct svga_winsys_context *swc, swc->region_relocation(swc, &cmd->guest.ptr, st->hwbuf, 0, region_flags); cmd->guest.pitch = st->base.stride; - swc->surface_relocation(swc, &cmd->host.sid, texture->handle, surface_flags); + swc->surface_relocation(swc, &cmd->host.sid, NULL, + texture->handle, surface_flags); cmd->host.face = st->face; /* PIPE_TEX_FACE_* and SVGA3D_CUBEFACE_* match */ cmd->host.mipmap = st->base.level; @@ -511,7 +512,8 @@ SVGA3D_BufferDMA(struct svga_winsys_context *swc, swc->region_relocation(swc, &cmd->guest.ptr, guest, 0, region_flags); cmd->guest.pitch = 0; - swc->surface_relocation(swc, &cmd->host.sid, host, surface_flags); + swc->surface_relocation(swc, &cmd->host.sid, + NULL, host, surface_flags); cmd->host.face = 0; cmd->host.mipmap = 0; -- cgit v1.2.3