← Back to branch summary

~andreas-pokorny/mir/activate-pointer-acceleration

« back to all changes in this revision

Viewing changes to tests/acceptance-tests/test_client_library.cpp

  • Committer: Christopher James Halse Rogers
  • Date: 2015-02-12 05:55:17 UTC
  • mfrom: (2314 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2326.
  • Revision ID: christopher.halse.rogers@canonical.com-20150212055517-4ebh62tbmq4co2m8
Merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/acceptance-tests/test_client_library.cpp
74
74
        config->surface_created(surface);
75
75
    }
76
76
 
77
 
    static void next_buffer_callback(MirSurface* surface, void* context)
 
77
    static void next_buffer_callback(MirBufferStream* bs, void* context)
78
78
    {
79
79
        ClientLibrary* config = reinterpret_cast<ClientLibrary*>(context);
80
 
        config->next_buffer(surface);
 
80
        config->next_buffer(bs);
81
81
    }
82
82
 
83
83
    static void release_surface_callback(MirSurface* surface, void* context)
97
97
        surface = new_surface;
98
98
    }
99
99
 
100
 
    virtual void next_buffer(MirSurface*)
 
100
    virtual void next_buffer(MirBufferStream*)
101
101
    {
102
102
        ++buffers;
103
103
    }
331
331
    surface = mir_connection_create_surface_sync(connection, &parm);
332
332
 
333
333
    MirNativeBuffer *native;
334
 
    mir_surface_get_current_buffer(surface, &native);
 
334
    auto bs = mir_surface_get_buffer_stream(surface);
 
335
    mir_buffer_stream_get_current_buffer(bs, &native);
335
336
    EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
336
 
    mir_surface_swap_buffers_sync(surface);
 
337
    mir_buffer_stream_swap_buffers_sync(bs);
337
338
    EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
338
339
    mir_surface_release_sync(surface);
339
340
 
341
342
    parm.height = 100;
342
343
 
343
344
    surface = mir_connection_create_surface_sync(connection, &parm);
344
 
    mir_surface_get_current_buffer(surface, &native);
 
345
    bs = mir_surface_get_buffer_stream(surface);
 
346
    mir_buffer_stream_get_current_buffer(bs, &native);
345
347
    EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
346
 
    mir_surface_swap_buffers_sync(surface);
 
348
    mir_buffer_stream_swap_buffers_sync(bs);
347
349
    EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
348
350
    mir_surface_release_sync(surface);
349
351
 
352
354
    parm.buffer_usage = mir_buffer_usage_software;
353
355
 
354
356
    surface = mir_connection_create_surface_sync(connection, &parm);
355
 
    mir_surface_get_current_buffer(surface, &native);
 
357
    bs = mir_surface_get_buffer_stream(surface);
 
358
    mir_buffer_stream_get_current_buffer(bs, &native);
356
359
    EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
357
 
    mir_surface_swap_buffers_sync(surface);
 
360
    mir_buffer_stream_swap_buffers_sync(bs);
358
361
    EXPECT_FALSE(native->flags & mir_buffer_flag_can_scanout);
359
362
    mir_surface_release_sync(surface);
360
363
 
361
364
    parm.buffer_usage = mir_buffer_usage_hardware;
362
365
 
363
366
    surface = mir_connection_create_surface_sync(connection, &parm);
364
 
    mir_surface_get_current_buffer(surface, &native);
 
367
    bs = mir_surface_get_buffer_stream(surface);
 
368
    mir_buffer_stream_get_current_buffer(bs, &native);
365
369
    EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
366
 
    mir_surface_swap_buffers_sync(surface);
 
370
    mir_buffer_stream_swap_buffers_sync(bs);
367
371
    EXPECT_TRUE(native->flags & mir_buffer_flag_can_scanout);
368
372
    mir_surface_release_sync(surface);
369
373
 
402
406
        parm.height = size.height;
403
407
 
404
408
        surface = mir_connection_create_surface_sync(connection, &parm);
 
409
        auto bs = mir_surface_get_buffer_stream(surface);
405
410
 
406
411
        MirNativeBuffer *native = NULL;
407
 
        mir_surface_get_current_buffer(surface, &native);
 
412
        mir_buffer_stream_get_current_buffer(bs, &native);
408
413
        ASSERT_THAT(native, NotNull());
409
414
        EXPECT_THAT(native->width, Eq(parm.width));
410
415
        ASSERT_THAT(native->height, Eq(parm.height));
411
416
 
412
 
        mir_surface_swap_buffers_sync(surface);
413
 
        mir_surface_get_current_buffer(surface, &native);
 
417
        mir_buffer_stream_swap_buffers_sync(bs);
 
418
        mir_buffer_stream_get_current_buffer(bs, &native);
414
419
        ASSERT_THAT(native, NotNull());
415
420
        EXPECT_THAT(native->width, Eq(parm.width));
416
421
        ASSERT_THAT(native->height, Eq(parm.height));
476
481
    mir_wait_for(mir_connection_create_surface(connection, &request_params, create_surface_callback, this));
477
482
 
478
483
    buffers = 0;
479
 
    mir_wait_for(mir_surface_swap_buffers(surface, next_buffer_callback, this));
 
484
    mir_wait_for(mir_buffer_stream_swap_buffers(mir_surface_get_buffer_stream(surface), next_buffer_callback, this));
480
485
    EXPECT_THAT(buffers, Eq(1));
481
486
 
482
487
    mir_wait_for(mir_surface_release(surface, release_surface_callback, this));
501
506
 
502
507
    surface = mir_connection_create_surface_sync(connection, &request_params);
503
508
 
504
 
    mir_surface_swap_buffers_sync(surface);
 
509
    mir_buffer_stream_swap_buffers_sync(mir_surface_get_buffer_stream(surface));
505
510
    EXPECT_TRUE(mir_surface_is_valid(surface));
506
511
    EXPECT_STREQ(mir_surface_get_error_message(surface), "");
507
512
 
601
606
 
602
607
    while (buffers < 1024)
603
608
    {
604
 
        mir_surface_swap_buffers_sync(surf_one);
605
 
        mir_surface_swap_buffers_sync(surf_two);
 
609
        mir_buffer_stream_swap_buffers_sync(
 
610
            mir_surface_get_buffer_stream(surf_one));
 
611
        mir_buffer_stream_swap_buffers_sync(
 
612
            mir_surface_get_buffer_stream(surf_two));
606
613
 
607
614
        buffers++;
608
615
    }
655
662
    EXPECT_THAT(surface, IsValid());
656
663
 
657
664
    MirNativeBuffer* native_buffer;
658
 
    mir_surface_get_current_buffer(surface, &native_buffer);
 
665
    mir_buffer_stream_get_current_buffer(
 
666
        mir_surface_get_buffer_stream(surface), &native_buffer);
659
667
 
660
668
    EXPECT_THAT(native_buffer->width, Eq(width));
661
669
    EXPECT_THAT(native_buffer->height, Eq(height));
685
693
    EXPECT_THAT(surface, IsValid());
686
694
 
687
695
    MirNativeBuffer* native_buffer;
688
 
    mir_surface_get_current_buffer(surface, &native_buffer);
 
696
    mir_buffer_stream_get_current_buffer(
 
697
        mir_surface_get_buffer_stream(surface), &native_buffer);
689
698
 
690
699
    EXPECT_THAT(native_buffer->width, Eq(width));
691
700
    EXPECT_THAT(native_buffer->height, Eq(height));
759
768
    EXPECT_THAT(surface, IsValid());
760
769
 
761
770
    MirNativeBuffer* native_buffer;
762
 
    mir_surface_get_current_buffer(surface, &native_buffer);
 
771
    mir_buffer_stream_get_current_buffer(
 
772
        mir_surface_get_buffer_stream(surface), &native_buffer);
763
773
 
764
774
    EXPECT_THAT(native_buffer->width,
765
775
                Eq(requested_output.modes[requested_output.current_mode].horizontal_resolution));
802
812
    MirNativeBuffer* native_buffer;
803
813
    // We use the fact that our stub client platform returns NULL if asked for a native
804
814
    // buffer on a surface with mir_buffer_usage_software set.
805
 
    mir_surface_get_current_buffer(surface, &native_buffer);
 
815
    mir_buffer_stream_get_current_buffer(
 
816
        mir_surface_get_buffer_stream(surface), &native_buffer);
806
817
 
807
818
    EXPECT_THAT(native_buffer, Not(Eq(nullptr)));
808
819
 
831
842
    MirGraphicsRegion graphics_region;
832
843
    // We use the fact that our stub client platform returns a NULL vaddr if
833
844
    // asked to map a hardware buffer.
834
 
    mir_surface_get_graphics_region(surface, &graphics_region);
 
845
    mir_buffer_stream_get_graphics_region(
 
846
        mir_surface_get_buffer_stream(surface), &graphics_region);
835
847
 
836
848
    EXPECT_THAT(graphics_region.vaddr, Not(Eq(nullptr)));
837
849