On 16 December 2014 at 08:18, Chad Versace <[email protected]> wrote:
> This prepares for adding waffle_window_create2() to Waffle's public API,
> which will have an attrib_list parameter.
>
> No attributes are supported yet. Therefore this patch validates, at the
> top of each ${PLATFORM}_window_create(), that the attrib_list is empty.
>
> Signed-off-by: Chad Versace <[email protected]>
> ---
> src/waffle/android/droid_window.c | 7 ++++++-
> src/waffle/api/waffle_window.c | 3 ++-
> src/waffle/cgl/cgl_window.h | 3 ++-
> src/waffle/cgl/cgl_window.m | 9 ++++++++-
> src/waffle/core/wcore_platform.h | 3 ++-
> src/waffle/gbm/wgbm_window.c | 9 ++++++++-
> src/waffle/gbm/wgbm_window.h | 3 ++-
> src/waffle/glx/glx_window.c | 9 ++++++++-
> src/waffle/glx/glx_window.h | 5 +++--
> src/waffle/wayland/wayland_window.c | 11 +++++++++--
> src/waffle/wayland/wayland_window.h | 3 ++-
> src/waffle/wgl/wgl_window.c | 8 +++++++-
> src/waffle/wgl/wgl_window.h | 3 ++-
> src/waffle/xegl/xegl_window.c | 8 +++++++-
> src/waffle/xegl/xegl_window.h | 6 ++++--
> 15 files changed, 72 insertions(+), 18 deletions(-)
>
> diff --git a/src/waffle/android/droid_window.c
> b/src/waffle/android/droid_window.c
> index 98e8d2d..43dd1f1 100644
> --- a/src/waffle/android/droid_window.c
> +++ b/src/waffle/android/droid_window.c
> @@ -38,13 +38,18 @@ struct wcore_window*
> droid_window_create(struct wcore_platform *wc_plat,
> struct wcore_config *wc_config,
> int32_t width,
> - int32_t height)
> + int32_t height,
> + const intptr_t attrib_list[])
Based on the rest of the patch we might need a
#include "wcore_attrib_list.h"
...
> diff --git a/src/waffle/wgl/wgl_window.c b/src/waffle/wgl/wgl_window.c
> index 03887e3..27720b3 100644
> --- a/src/waffle/wgl/wgl_window.c
> +++ b/src/waffle/wgl/wgl_window.c
> @@ -25,6 +25,7 @@
>
> #include <windows.h>
>
> +#include "wcore_attrib_list.h"
> #include "wcore_error.h"
>
> #include "wgl_config.h"
> @@ -69,13 +70,18 @@ struct wcore_window*
> wgl_window_create(struct wcore_platform *wc_plat,
> struct wcore_config *wc_config,
> int32_t width,
> - int32_t height)
> + int32_t height,
> + const intptr_t attrib_list[])
> {
> struct wgl_config *config = wgl_config(wc_config);
> bool ok;
>
> assert(config->window);
>
> + if (wcore_error_if_attrib_list_nonempty(attrib_list)) {
> + return NULL;
> + }
> +
I cannot see wcore_error_if_attrib_list_nonempty() declared anywhere.
Did I miss a patch ?
...
> diff --git a/src/waffle/xegl/xegl_window.h b/src/waffle/xegl/xegl_window.h
> index 1f963ba..4b1f0ba 100644
> --- a/src/waffle/xegl/xegl_window.h
> +++ b/src/waffle/xegl/xegl_window.h
> @@ -27,6 +27,7 @@
>
> #include <stdbool.h>
>
> +#include "wcore_attrib_list.h"
Maybe move this to the xegl_window.c file ?
Cheers
Emil
_______________________________________________
waffle mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/waffle
