← Back to branch summary

~ubuntu-branches/ubuntu/natty/mesa/natty-proposed

« back to all changes in this revision

Viewing changes to src/gallium/drivers/trace/tr_dump.c

  • Committer: Bazaar Package Importer
  • Author(s): Robert Hooker, Robert Hooker, Christopher James Halse Rogers
  • Date: 2010-09-14 08:55:40 UTC
  • mfrom: (1.2.28 upstream)
  • Revision ID: james.westby@ubuntu.com-20100914085540-m4fpl0hdjlfd4jgz
Tags: 7.9~git20100909-0ubuntu1
https://launchpad.net/bugs/631413
https://launchpad.net/bugs/628930
https://launchpad.net/bugs/628727
https://launchpad.net/bugs/596292
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/630315
https://launchpad.net/bugs/613694
https://launchpad.net/bugs/599741
https://launchpad.net/bugs/578619
https://launchpad.net/bugs/626943
https://launchpad.net/bugs/610541
https://launchpad.net/bugs/601052
[ Robert Hooker ]
* New upstream git snapshot up to commit 94118fe2d4b1e5 (LP: #631413)
* New features include ATI HD5xxx series support in r600, and a vastly
  improved glsl compiler.
* Remove pre-generated .pc's, use the ones generated at build time
  instead.
* Remove all references to mesa-utils now that its no longer shipped
  with the mesa source.
* Disable the experimental ARB_fragment_shader option by default on
  i915, it exposes incomplete functionality that breaks KDE compositing
  among other things. It can be enabled via driconf still. (LP: #628930).

[ Christopher James Halse Rogers ]
* debian/patches/04_osmesa_version.diff:
  - Refresh for new upstream
* Bugs fixed in this release:
  - Fixes severe rendering corruption in Unity on radeon (LP: #628727,
    LP: #596292, LP: #599741, LP: #630315, LP: #613694, LP: #599741).
  - Also fixes rendering in gnome-shell (LP: #578619).
  - Flickering in OpenGL apps on radeon (LP: #626943, LP: #610541).
  - Provides preliminary support for new intel chips (LP: #601052).
* debian/rules:
  - Update configure flags to match upstream reshuffling.
  - Explicitly remove gallium DRI drivers that we don't want to ship.
* Update debian/gbp.conf for this Maverick-specific packaging
* libegl1-mesa-dri-x11,kms: There are no longer separate kms or x11 drivers
  for EGL, libegl1-mesa-drivers now contains a single driver that provides
  both backends.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gallium/drivers/trace/tr_dump.c
50
50
#include "util/u_debug.h"
51
51
#include "util/u_memory.h"
52
52
#include "util/u_string.h"
 
53
#include "util/u_math.h"
 
54
#include "util/u_format.h"
53
55
 
54
56
#include "tr_dump.h"
55
57
#include "tr_screen.h"
56
58
#include "tr_texture.h"
57
 
#include "tr_buffer.h"
58
59
 
59
60
 
60
61
static struct os_stream *stream = NULL;
471
472
   trace_dump_writes("</bytes>");
472
473
}
473
474
 
 
475
void trace_dump_box_bytes(const void *data,
 
476
                          enum pipe_format format,
 
477
                          const struct pipe_box *box,
 
478
                          unsigned stride,
 
479
                          unsigned slice_stride)
 
480
{
 
481
   size_t size;
 
482
 
 
483
   if (slice_stride)
 
484
      size = box->depth * slice_stride;
 
485
   else if (stride)
 
486
      size = util_format_get_nblocksy(format, box->height) * stride;
 
487
   else {
 
488
      size = util_format_get_nblocksx(format, box->width) * util_format_get_blocksize(format);
 
489
   }
 
490
 
 
491
   trace_dump_bytes(data, size);
 
492
}
 
493
 
474
494
void trace_dump_string(const char *str)
475
495
{
476
496
   if (!dumping)
574
594
      trace_dump_null();
575
595
}
576
596
 
577
 
void trace_dump_buffer_ptr(struct pipe_buffer *_buffer)
578
 
{
579
 
   if (!dumping)
580
 
      return;
581
 
 
582
 
   if (_buffer) {
583
 
      struct trace_buffer *tr_buf = trace_buffer(_buffer);
584
 
      trace_dump_ptr(tr_buf->buffer);
585
 
   } else {
586
 
      trace_dump_null();
587
 
   }
588
 
}
589
 
 
590
 
void trace_dump_texture_ptr(struct pipe_texture *_texture)
591
 
{
592
 
   if (!dumping)
593
 
      return;
594
 
 
595
 
   if (_texture) {
596
 
      struct trace_texture *tr_tex = trace_texture(_texture);
597
 
      trace_dump_ptr(tr_tex->texture);
 
597
 
 
598
void trace_dump_resource_ptr(struct pipe_resource *_resource)
 
599
{
 
600
   if (!dumping)
 
601
      return;
 
602
 
 
603
   if (_resource) {
 
604
      struct trace_resource *tr_resource = trace_resource(_resource);
 
605
      trace_dump_ptr(tr_resource->resource);
598
606
   } else {
599
607
      trace_dump_null();
600
608
   }