← Back to branch summary

~ubuntu-branches/ubuntu/precise/mesa-lts-raring/precise-updates

« back to all changes in this revision

Viewing changes to src/gallium/drivers/nouveau/nouveau_buffer.c

  • Committer: Package Import Robot
  • Author(s): Maarten Lankhorst
  • Date: 2013-10-16 13:52:07 UTC
  • mfrom: (3.1.1 precise-proposed)
  • Revision ID: package-import@ubuntu.com-20131016135207-dhoa2sis2s8rfjbu
Tags: 9.1.7-1ubuntu2~precise1
https://launchpad.net/bugs/1236340
Copy from raring, new upstream release. (LP: #1236340)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/nouveau/nouveau_buffer.c
266
266
   tx.base.box.x = 0;
267
267
   tx.base.box.width = buf->base.width0;
268
268
   tx.bo = NULL;
 
269
   tx.map = NULL;
269
270
 
270
271
   if (!buf->data)
271
272
      if (!nouveau_buffer_malloc(buf))
624
625
      tx.base.box.x = 0;
625
626
      tx.base.box.width = buf->base.width0;
626
627
      tx.bo = NULL;
 
628
      tx.map = NULL;
627
629
      if (!nouveau_transfer_staging(nv, &tx, FALSE))
628
630
         return FALSE;
629
631
      nouveau_transfer_write(nv, &tx, 0, tx.base.box.width);