Merge lp:~kdub/mir/privatize-get-buffer-package into lp:~mir-team/mir/publish-new-apis

[Kevin DuBois]

privatize mir_buffer_get_buffer_package. This is only really useful to the nested server, and can be moved to an extension for nested servers later.

privatize mir_buffer_get_buffer_package. This is only really useful to the nested server, and can be moved to an extension for nested servers later.

[Kevin DuBois (kdub)]

rejected in discussion, this function is useful to nested and the drivers.

Unmerged revisions

3957. By Kevin DuBois on 2017-02-02

missing file

3956. By Kevin DuBois on 2017-02-02

privatize mir_buffer_get_buffer_package

3955. By Cemil Azizoglu on 2017-02-01

Fix clang build.

3954. By Cemil Azizoglu on 2017-02-01

Merge lp:mir... no conflicts!?

3953. By Cemil Azizoglu on 2017-02-01

Deprecate types too.

3952. By Cemil Azizoglu on 2017-02-01

Merge lp:mir, fix conflict again.

3951. By Cemil Azizoglu on 2017-02-01

merge lp:mir, fix conflict

3950. By Cemil Azizoglu on 2017-02-01

More cleanups

3949. By Cemil Azizoglu on 2017-02-01

"Staging" can now use the published headers

3948. By Cemil Azizoglu on 2017-02-01

Unversion and ignore version.h

=== modified file 'include/client/mir_toolkit/mir_buffer.h'
--- include/client/mir_toolkit/mir_buffer.h	2017-02-01 17:11:12 +0000
+++ include/client/mir_toolkit/mir_buffer.h	2017-02-02 14:17:12 +0000
@@ -80,14 +80,6 @@
  **/
 char const *mir_buffer_get_error_message(MirBuffer* buffer);
 
-/**
- * Access the MirBufferPackage
- *
- *   \param [in] buffer    The buffer
- *   \return               The MirBufferPackage representing buffer 
- */
-MirBufferPackage* mir_buffer_get_buffer_package(MirBuffer* buffer);
-
 /** Access a CPU-mapped region associated with a given buffer.
  *
  *   \param [in] buffer    The buffer

=== modified file 'src/client/symbols.map'
--- src/client/symbols.map	2017-02-01 22:28:16 +0000
+++ src/client/symbols.map	2017-02-02 14:17:12 +0000
@@ -379,6 +379,7 @@
 
     #private functions needed temporarily by nested passthrough
     #should not be published along with the rest of the NBS symbols
+    mir_buffer_get_buffer_package;
     mir_buffer_get_egl_image_parameters;
     mir_presentation_chain_set_queueing_mode;
     mir_presentation_chain_set_dropping_mode;
@@ -588,7 +589,6 @@
     mir_buffer_get_buffer_usage;
     mir_buffer_is_valid;
     mir_buffer_get_error_message;
-    mir_buffer_get_buffer_package;
 } MIR_CLIENT_0.26;
 
 MIR_CLIENT_0.27 {  # New functions in Mir 0.27 or 1.0

=== modified file 'src/include/client/mir_toolkit/mir_buffer_private.h'
--- src/include/client/mir_toolkit/mir_buffer_private.h	2017-02-01 17:11:12 +0000
+++ src/include/client/mir_toolkit/mir_buffer_private.h	2017-02-02 14:17:12 +0000
@@ -66,6 +66,14 @@
     EGLClientBuffer* client_buffer,
     EGLint** attrs);
 
+/**
+ * Access the MirBufferPackage
+ *
+ *   \param [in] buffer    The buffer
+ *   \return               The MirBufferPackage representing buffer 
+ */
+MirBufferPackage* mir_buffer_get_buffer_package(MirBuffer* buffer);
+
 #ifdef __cplusplus
 }
 /**@}*/

=== modified file 'tests/acceptance-tests/CMakeLists.txt'
--- tests/acceptance-tests/CMakeLists.txt	2017-02-01 17:43:59 +0000
+++ tests/acceptance-tests/CMakeLists.txt	2017-02-02 14:17:12 +0000
@@ -64,6 +64,7 @@
   test_presentation_chain.cpp
   test_render_surface.cpp
   test_buffer_stream_arrangement1.cpp
+  test_mir_buffer.cpp
 )
 
 if (MIR_TEST_PLATFORM STREQUAL "mesa-kms" OR MIR_TEST_PLATFORM STREQUAL "mesa-x11")
@@ -89,6 +90,10 @@
   # uses src/include/common/mir/protobuf/protocol_version.h
   set_source_files_properties(test_client_library.cpp PROPERTIES COMPILE_FLAGS
           "${CMAKE_CXXFLAGS} -I ${CMAKE_SOURCE_DIR}")
+
+  # uses src/include/client/mir_toolkit/mir_buffer_private.h
+  set_source_files_properties(test_mir_buffer.cpp PROPERTIES COMPILE_FLAGS
+          "${CMAKE_CXXFLAGS} -I ${PROJECT_SOURCE_DIR}/src/include/client")
 # END "throwbacks"
 
 mir_add_wrapped_executable(

=== added file 'tests/acceptance-tests/test_mir_buffer.cpp'
--- tests/acceptance-tests/test_mir_buffer.cpp	1970-01-01 00:00:00 +0000
+++ tests/acceptance-tests/test_mir_buffer.cpp	2017-02-02 14:17:12 +0000
@@ -0,0 +1,43 @@
+/*
+ * Copyright © 2017 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Kevin DuBois <[e-mail]>
+ */
+
+#include "mir/geometry/size.h"
+#include "mir_toolkit/mir_native_buffer.h"
+#include "mir_toolkit/mir_presentation_chain.h"
+#include "mir_toolkit/mir_buffer_private.h"
+#include "mir_test_framework/connected_client_headless_server.h"
+
+namespace mtf = mir_test_framework;
+using namespace testing;
+
+struct MirBuffer : mtf::ConnectedClientHeadlessServer
+{
+};
+
+TEST_F(MirBuffer, can_access_platform_message_representing_buffer)
+{
+    mir::geometry::Size size { 100, 120 };
+    auto buffer = mir_connection_allocate_buffer_sync(
+        connection, size.width.as_int(), size.height.as_int(), mir_pixel_format_abgr_8888);
+    auto message = mir_buffer_get_buffer_package(buffer);
+    ASSERT_THAT(message, Ne(nullptr));
+    EXPECT_THAT(message->data_items, Ge(1));
+    EXPECT_THAT(message->fd_items, Ge(1));
+    EXPECT_THAT(message->width, Eq(size.width.as_int()));
+    EXPECT_THAT(message->height, Eq(size.height.as_int()));
+}

=== modified file 'tests/acceptance-tests/test_presentation_chain.cpp'
--- tests/acceptance-tests/test_presentation_chain.cpp	2017-02-01 22:28:16 +0000
+++ tests/acceptance-tests/test_presentation_chain.cpp	2017-02-02 14:17:12 +0000
@@ -235,28 +235,6 @@
     EXPECT_THAT(context.buffer(), Ne(nullptr));    
 }
 
-TEST_F(PresentationChain, can_access_platform_message_representing_buffer)
-{
-    SurfaceWithChainFromStart window(connection, size, pf);
-
-    MirBufferSync context;
-    mir_connection_allocate_buffer(
-        connection,
-        size.width.as_int(), size.height.as_int(), pf,
-        buffer_callback, &context);
-
-    EXPECT_TRUE(context.wait_for_buffer(10s));
-    auto buffer = context.buffer();
-    EXPECT_THAT(context.buffer(), Ne(nullptr));
-
-    auto message = mir_buffer_get_buffer_package(buffer);
-    ASSERT_THAT(message, Ne(nullptr));
-    EXPECT_THAT(message->data_items, Ge(1));
-    EXPECT_THAT(message->fd_items, Ge(1));
-    EXPECT_THAT(message->width, Eq(size.width.as_int()));
-    EXPECT_THAT(message->height, Eq(size.height.as_int()));
-}
-
 TEST_F(PresentationChain, has_native_fence)
 {
     SurfaceWithChainFromStart window(connection, size, pf);