← Back to branch summary

~ubuntu-branches/debian/wheezy/xserver-xorg-video-intel/wheezy

« back to all changes in this revision

Viewing changes to src/sna/kgem_debug.c

  • Committer: Package Import Robot
  • Author(s): Cyril Brulebois, Timo Aaltonen
  • Date: 2011-11-19 12:46:57 UTC
  • mfrom: (26.1.11 sid)
  • Revision ID: package-import@ubuntu.com-20111119124657-zpht20ygj578uqwn
Tags: 2:2.17.0-1
http://bugs.debian.org/635953
[ Timo Aaltonen ]
New upstream release. (Closes: #635953)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/sna/kgem_debug.c
255
255
                        break;
256
256
                }
257
257
 
258
 
                kgem_debug_print(data, offset, 1, "format %s, pitch %d, "
 
258
                kgem_debug_print(data, offset, 1, "format %s, rop %x, pitch %d, "
259
259
                          "clipping %sabled\n", format,
 
260
                          (data[1] >> 16) & 0xff,
260
261
                          (short)(data[1] & 0xffff),
261
262
                          data[1] & (1 << 30) ? "en" : "dis");
262
263
                kgem_debug_print(data, offset, 2, "(%d,%d)\n",
272
273
                                 kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
273
274
                                 kgem_debug_handle_tiling(kgem, reloc->target_handle));
274
275
                kgem_debug_print(data, offset, 5, "color\n");
 
276
                assert(kgem->gen >= 40 ||
 
277
                       kgem_debug_handle_is_fenced(kgem, reloc->target_handle));
275
278
                return len;
276
279
 
277
280
        case 0x53:
301
304
                        break;
302
305
                }
303
306
 
304
 
                kgem_debug_print(data, offset, 1, "format %s, dst pitch %d, "
 
307
                kgem_debug_print(data, offset, 1, "format %s, rop %x, dst pitch %d, "
305
308
                                 "clipping %sabled\n", format,
 
309
                                 (data[1] >> 16) & 0xff,
306
310
                                 (short)(data[1] & 0xffff),
307
311
                                 data[1] & (1 << 30) ? "en" : "dis");
308
312
                kgem_debug_print(data, offset, 2, "dst (%d,%d)\n",
317
321
                                 reloc->read_domains, reloc->write_domain,
318
322
                                 kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
319
323
                                 kgem_debug_handle_tiling(kgem, reloc->target_handle));
 
324
                assert(kgem->gen >= 40 ||
 
325
                       kgem_debug_handle_is_fenced(kgem, reloc->target_handle));
 
326
 
320
327
                kgem_debug_print(data, offset, 5, "src (%d,%d)\n",
321
328
                                 data[5] & 0xffff, data[5] >> 16);
322
329
                kgem_debug_print(data, offset, 6, "src pitch %d\n",
329
336
                                 reloc->read_domains, reloc->write_domain,
330
337
                                 kgem_debug_handle_is_fenced(kgem, reloc->target_handle),
331
338
                                 kgem_debug_handle_tiling(kgem, reloc->target_handle));
 
339
                assert(kgem->gen >= 40 ||
 
340
                       kgem_debug_handle_is_fenced(kgem, reloc->target_handle));
 
341
 
332
342
                return len;
333
343
        }
334
344
 
358
368
 
359
369
static int (*decode_3d(int gen))(struct kgem*, uint32_t)
360
370
{
361
 
        if (gen >= 60) {
 
371
        if (gen >= 80) {
 
372
        } else if (gen >= 70) {
 
373
                return kgem_gen7_decode_3d;
 
374
        } else if (gen >= 60) {
362
375
                return kgem_gen6_decode_3d;
363
376
        } else if (gen >= 50) {
364
377
                return kgem_gen5_decode_3d;
374
387
 
375
388
static void (*finish_state(int gen))(struct kgem*)
376
389
{
377
 
        if (gen >= 60) {
 
390
        if (gen >= 80) {
 
391
        } else if (gen >= 70) {
 
392
                return kgem_gen7_finish_state;
 
393
        } else if (gen >= 60) {
378
394
                return kgem_gen6_finish_state;
379
395
        } else if (gen >= 50) {
380
396
                return kgem_gen5_finish_state;