diff options
| author | Ben Skeggs <bskeggs@redhat.com> | 2009-06-04 10:19:04 +1000 |
|---|---|---|
| committer | Ben Skeggs <bskeggs@redhat.com> | 2009-06-05 14:37:01 +1000 |
| commit | bc466be695913cd504cefddd857ac1cefda87a04 (patch) | |
| tree | ffdf780ad66bd774d80205478131fc60eed13c05 /src/gallium/drivers/nv50/nv50_surface.c | |
| parent | 072fdc1fd325256d87b182d4f55c8a5838119cf0 (diff) | |
nouveau: add pipe_buffer/fence code to pipe drivers, move nv50 over
Diffstat (limited to 'src/gallium/drivers/nv50/nv50_surface.c')
| -rw-r--r-- | src/gallium/drivers/nv50/nv50_surface.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/nv50/nv50_surface.c b/src/gallium/drivers/nv50/nv50_surface.c index c0f0efe158..121eddfc83 100644 --- a/src/gallium/drivers/nv50/nv50_surface.c +++ b/src/gallium/drivers/nv50/nv50_surface.c @@ -54,14 +54,10 @@ nv50_surface_set(struct nv50_screen *screen, struct pipe_surface *ps, int dst) struct nv50_miptree *mt = nv50_miptree(ps->texture); struct nouveau_channel *chan = screen->nvws->channel; struct nouveau_grobj *eng2d = screen->eng2d; - struct nouveau_bo *bo; + struct nouveau_bo *bo = nouveau_bo(nv50_miptree(ps->texture)->buffer); int format, mthd = dst ? NV50_2D_DST_FORMAT : NV50_2D_SRC_FORMAT; int flags = NOUVEAU_BO_VRAM | (dst ? NOUVEAU_BO_WR : NOUVEAU_BO_RD); - bo = screen->nvws->get_bo(nv50_miptree(ps->texture)->buffer); - if (!bo) - return 1; - format = nv50_format(ps->format); if (format < 0) return 1; |