Merge lp:~florian-will/mir/mir into lp:mir

[Daniel van Vugt]

Provide info about NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS to driver.
(LP: #1239160)

Apparently adds support for HTC Desire Z (and HP TouchPad?)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1097
http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-ci/156/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-saucy-i386-build/2337
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-saucy-amd64-build/2222
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/153
        deb: http://jenkins.qa.ubuntu.com/job/mir-team-mir-development-branch-saucy-amd64-ci/153/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/mir-team-mir-development-branch-ci/156/rebuild

review: Approve (continuous-integration)

[Daniel van Vugt (vanvugt)]

I'm not familiar with the Android code in question, but anything (even if the logic is wrong) is better than the existing fatal exception.

review: Approve

[Alan Griffiths (alan-griffiths)]

We should also addressed the unhandled exception. But I don't see this breaking anything that already works.

review: Approve

[Kevin DuBois (kdub)]

this is ok. (i had similar things in my mali-client-render-support branch). The only small problem is that drivers technically could use the stubbed-out cancel buffer hook silently now... should be fixed in short order though when I re-propose that branch

=== modified file 'src/client/android/client_surface_interpreter.cpp'
--- src/client/android/client_surface_interpreter.cpp	2013-05-16 20:19:12 +0000
+++ src/client/android/client_surface_interpreter.cpp	2013-10-14 02:31:08 +0000
@@ -65,6 +65,8 @@
             return driver_pixel_format;
         case NATIVE_WINDOW_TRANSFORM_HINT:
             return 0;
+        case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:
+            return 1;
         default:
             throw std::runtime_error("driver requested unsupported query");
     }

=== modified file 'src/server/graphics/android/internal_client_window.cpp'
--- src/server/graphics/android/internal_client_window.cpp	2013-09-24 18:25:28 +0000
+++ src/server/graphics/android/internal_client_window.cpp	2013-10-14 02:31:08 +0000
@@ -73,6 +73,8 @@
             return format;
         case NATIVE_WINDOW_TRANSFORM_HINT:
             return 0; 
+        case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:
+            return 1;
         default:
             BOOST_THROW_EXCEPTION(std::runtime_error("driver requests info we dont provide. key: " + key));
     }

=== modified file 'src/server/graphics/android/server_render_window.cpp'
--- src/server/graphics/android/server_render_window.cpp	2013-09-24 18:25:28 +0000
+++ src/server/graphics/android/server_render_window.cpp	2013-10-14 02:31:08 +0000
@@ -83,6 +83,8 @@
             return format;
         case NATIVE_WINDOW_TRANSFORM_HINT:
             return 0; 
+        case NATIVE_WINDOW_MIN_UNDEQUEUED_BUFFERS:
+            return 1;
         default:
             BOOST_THROW_EXCEPTION(std::runtime_error("driver requests info we dont provide. key: " + key));
     }