← 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_state.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_state.c
44
44
}
45
45
 
46
46
 
47
 
void trace_dump_template(const struct pipe_texture *templat)
 
47
void trace_dump_resource_template(const struct pipe_resource *templat)
48
48
{
49
49
   if (!trace_dumping_enabled_locked())
50
50
      return;
54
54
      return;
55
55
   }
56
56
 
57
 
   trace_dump_struct_begin("pipe_texture");
 
57
   trace_dump_struct_begin("pipe_resource");
58
58
 
59
59
   trace_dump_member(int, templat, target);
60
60
   trace_dump_member(format, templat, format);
72
72
   trace_dump_member_end();
73
73
 
74
74
   trace_dump_member(uint, templat, last_level);
75
 
   trace_dump_member(uint, templat, tex_usage);
 
75
   trace_dump_member(uint, templat, usage);
 
76
   trace_dump_member(uint, templat, bind);
 
77
   trace_dump_member(uint, templat, flags);
 
78
 
 
79
   trace_dump_struct_end();
 
80
}
 
81
 
 
82
 
 
83
void trace_dump_subresource(const struct pipe_subresource *subresource)
 
84
{
 
85
   if (!trace_dumping_enabled_locked())
 
86
      return;
 
87
 
 
88
   if(!subresource) {
 
89
      trace_dump_null();
 
90
      return;
 
91
   }
 
92
 
 
93
   trace_dump_struct_begin("pipe_subresource");
 
94
 
 
95
   trace_dump_member(uint, subresource, face);
 
96
   trace_dump_member(uint, subresource, level);
 
97
 
 
98
   trace_dump_struct_end();
 
99
}
 
100
 
 
101
 
 
102
void trace_dump_box(const struct pipe_box *box)
 
103
{
 
104
   if (!trace_dumping_enabled_locked())
 
105
      return;
 
106
 
 
107
   if(!box) {
 
108
      trace_dump_null();
 
109
      return;
 
110
   }
 
111
 
 
112
   trace_dump_struct_begin("pipe_box");
 
113
 
 
114
   trace_dump_member(uint, box, x);
 
115
   trace_dump_member(uint, box, y);
 
116
   trace_dump_member(uint, box, z);
 
117
   trace_dump_member(uint, box, width);
 
118
   trace_dump_member(uint, box, height);
 
119
   trace_dump_member(uint, box, depth);
76
120
 
77
121
   trace_dump_struct_end();
78
122
}
92
136
 
93
137
   trace_dump_member(bool, state, flatshade);
94
138
   trace_dump_member(bool, state, light_twoside);
95
 
   trace_dump_member(uint, state, front_winding);
96
 
   trace_dump_member(uint, state, cull_mode);
97
 
   trace_dump_member(uint, state, fill_cw);
98
 
   trace_dump_member(uint, state, fill_ccw);
99
 
   trace_dump_member(bool, state, offset_cw);
100
 
   trace_dump_member(bool, state, offset_ccw);
 
139
   trace_dump_member(uint, state, front_ccw);
 
140
   trace_dump_member(uint, state, cull_face);
 
141
   trace_dump_member(uint, state, fill_front);
 
142
   trace_dump_member(uint, state, fill_back);
 
143
   trace_dump_member(bool, state, offset_point);
 
144
   trace_dump_member(bool, state, offset_line);
 
145
   trace_dump_member(bool, state, offset_tri);
101
146
   trace_dump_member(bool, state, scissor);
102
147
   trace_dump_member(bool, state, poly_smooth);
103
148
   trace_dump_member(bool, state, poly_stipple_enable);
387
432
}
388
433
 
389
434
 
 
435
void trace_dump_sampler_view_template(const struct pipe_sampler_view *state)
 
436
{
 
437
   if (!trace_dumping_enabled_locked())
 
438
      return;
 
439
 
 
440
   if(!state) {
 
441
      trace_dump_null();
 
442
      return;
 
443
   }
 
444
 
 
445
   trace_dump_struct_begin("pipe_sampler_view");
 
446
 
 
447
   trace_dump_member(format, state, format);
 
448
   trace_dump_member(uint, state, first_level);
 
449
   trace_dump_member(uint, state, last_level);
 
450
   trace_dump_member(uint, state, swizzle_r);
 
451
   trace_dump_member(uint, state, swizzle_g);
 
452
   trace_dump_member(uint, state, swizzle_b);
 
453
   trace_dump_member(uint, state, swizzle_a);
 
454
 
 
455
   trace_dump_struct_end();
 
456
}
 
457
 
 
458
 
390
459
void trace_dump_surface(const struct pipe_surface *state)
391
460
{
392
461
   if (!trace_dumping_enabled_locked())
428
497
 
429
498
   trace_dump_struct_begin("pipe_transfer");
430
499
 
431
 
   trace_dump_member(uint, state, width);
432
 
   trace_dump_member(uint, state, height);
 
500
   trace_dump_member(uint, state, box.width);
 
501
   trace_dump_member(uint, state, box.height);
433
502
 
434
503
   trace_dump_member(uint, state, stride);
435
504
   trace_dump_member(uint, state, usage);
436
505
 
437
 
   trace_dump_member(ptr, state, texture);
438
 
   trace_dump_member(uint, state, face);
439
 
   trace_dump_member(uint, state, level);
440
 
   trace_dump_member(uint, state, zslice);
 
506
   trace_dump_member(ptr, state, resource);
 
507
   trace_dump_member(uint, state, sr.face);
 
508
   trace_dump_member(uint, state, sr.level);
 
509
   trace_dump_member(uint, state, box.z);
441
510
 
442
511
   trace_dump_struct_end();
443
512
}
458
527
   trace_dump_member(uint, state, stride);
459
528
   trace_dump_member(uint, state, max_index);
460
529
   trace_dump_member(uint, state, buffer_offset);
461
 
   trace_dump_member(buffer_ptr, state, buffer);
 
530
   trace_dump_member(resource_ptr, state, buffer);
 
531
 
 
532
   trace_dump_struct_end();
 
533
}
 
534
 
 
535
 
 
536
void trace_dump_index_buffer(const struct pipe_index_buffer *state)
 
537
{
 
538
   if (!trace_dumping_enabled_locked())
 
539
      return;
 
540
 
 
541
   if(!state) {
 
542
      trace_dump_null();
 
543
      return;
 
544
   }
 
545
 
 
546
   trace_dump_struct_begin("pipe_index_buffer");
 
547
 
 
548
   trace_dump_member(uint, state, index_size);
 
549
   trace_dump_member(uint, state, offset);
 
550
   trace_dump_member(resource_ptr, state, buffer);
462
551
 
463
552
   trace_dump_struct_end();
464
553
}
479
568
   trace_dump_member(uint, state, src_offset);
480
569
 
481
570
   trace_dump_member(uint, state, vertex_buffer_index);
482
 
   trace_dump_member(uint, state, nr_components);
483
571
 
484
572
   trace_dump_member(format, state, src_format);
485
573