This looks mostly correct. Two comments below.
On 10/24/2012 06:11 AM, gro...@gmail.com wrote:
> From: Adrian Marius Negreanu <adrian.m.negre...@intel.com>
>
> Signed-off-by: Adrian Marius Negreanu <adrian.m.negre...@intel.com>
> +static void
> +enter_event_loop(struct piglit_winsys_framework *winsys_fw)
> +{
> + const struct piglit_gl_test_config *test_config =
> winsys_fw->wfl_fw.gl_fw.test_config;
> +
> + /* The Wayland window fails to appear on the first call to
> + * swapBuffers (which occured in display_cb above). This is
> + * likely due to swapBuffers being called before receiving an
> + * expose event. Until piglit has proper Wayland support,
> + * redraw as a workaround.
> + */
> + /* XXX: see if this is true on Android */
This comment block needs to be reworked. Its primary subject is Wayland, with
a little XXX note about Android appended to the end. Instead, its primary
subject should be
Android, with mention of Wayland if necessary. This is
piglit_android_framework.c, after all.
> + if (test_config->display)
> + test_config->display();
> +
> + /* FINISHME: Write event loop for Android.
> + *
> + * Until we have proper Android support, give the user enough time
> + * to view the window by sleeping.
> + */
> + sleep(8);
> +}
> diff --git a/tests/util/piglit-framework-gl/piglit_winsys_framework.c
> b/tests/util/piglit-framework-gl/piglit_winsys_framework.c
> index ebc938c..426605c 100644
> --- a/tests/util/piglit-framework-gl/piglit_winsys_framework.c
> +++ b/tests/util/piglit-framework-gl/piglit_winsys_framework.c
> @@ -32,6 +32,7 @@
> #include "piglit_winsys_framework.h"
> #include "piglit_wl_framework.h"
> #include "piglit_x11_framework.h"
> +#include "piglit_android_framework.h"
>
> struct piglit_winsys_framework*
> piglit_winsys_framework(struct piglit_gl_framework *gl_fw)
> @@ -152,6 +153,8 @@ piglit_winsys_framework_factory(const struct
> piglit_gl_test_config *test_config)
> */
> case WAFFLE_PLATFORM_WAYLAND:
> return piglit_wl_framework_create(test_config);
This case needs to be #ifdef'd like the WAFFLE_PLATFORM_GBM case. Otherwise,
Linux executables will fail to link because piglit_android_framework_create() is
undefined.
> + case WAFFLE_PLATFORM_ANDROID:
> + return piglit_android_framework_create(test_config);
> default:
> assert(0);
> return NULL;
>
_______________________________________________
Piglit mailing list
Piglit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/piglit
