ack, will merge this too
On Sun, Feb 7, 2016 at 10:10 AM, Frediano Ziglio <fziglio@xxxxxxxxxx> wrote:
> This patch should be squashed in earlier patches.
>
> Signed-off-by: Frediano Ziglio <fziglio@xxxxxxxxxx>
> ---
> server/red-dispatcher.c | 18 +++++++++---------
> server/spice-qxl.h | 21 ++++++++++-----------
> server/spice-server.syms | 4 ++--
> 3 files changed, 21 insertions(+), 22 deletions(-)
>
> diff --git a/server/red-dispatcher.c b/server/red-dispatcher.c
> index 29a7b77..dce20c4 100644
> --- a/server/red-dispatcher.c
> +++ b/server/red-dispatcher.c
> @@ -961,11 +961,11 @@ void spice_qxl_driver_unload(QXLInstance *instance)
> }
>
> SPICE_GNUC_VISIBLE
> -void spice_gl_scanout(QXLInstance *qxl,
> - int fd,
> - uint32_t width, uint32_t height,
> - uint32_t stride, uint32_t format,
> - int y_0_top)
> +void spice_qxl_gl_scanout(QXLInstance *qxl,
> + int fd,
> + uint32_t width, uint32_t height,
> + uint32_t stride, uint32_t format,
> + int y_0_top)
> {
> spice_return_if_fail(qxl != NULL);
> spice_return_if_fail(qxl->st->gl_draw_async == NULL);
> @@ -993,10 +993,10 @@ void spice_gl_scanout(QXLInstance *qxl,
> }
>
> SPICE_GNUC_VISIBLE
> -void spice_gl_draw_async(QXLInstance *qxl,
> - uint32_t x, uint32_t y,
> - uint32_t w, uint32_t h,
> - uint64_t cookie)
> +void spice_qxl_gl_draw_async(QXLInstance *qxl,
> + uint32_t x, uint32_t y,
> + uint32_t w, uint32_t h,
> + uint64_t cookie)
> {
> RedDispatcher *dispatcher;
> RedWorkerMessage message = RED_WORKER_MESSAGE_GL_DRAW_ASYNC;
> diff --git a/server/spice-qxl.h b/server/spice-qxl.h
> index 61549ac..b8910bf 100644
> --- a/server/spice-qxl.h
> +++ b/server/spice-qxl.h
> @@ -104,6 +104,16 @@ void spice_qxl_driver_unload(QXLInstance *instance);
> /* since spice 0.12.6 */
> void spice_qxl_set_max_monitors(QXLInstance *instance,
> unsigned int max_monitors);
> +/* since spice 0.13.1 */
> +void spice_qxl_gl_scanout(QXLInstance *instance,
> + int fd,
> + uint32_t width, uint32_t height,
> + uint32_t stride, uint32_t format,
> + int y_0_top);
> +void spice_qxl_gl_draw_async(QXLInstance *instance,
> + uint32_t x, uint32_t y,
> + uint32_t w, uint32_t h,
> + uint64_t cookie);
>
> typedef struct QXLDrawArea {
> uint8_t *buf;
> @@ -203,15 +213,4 @@ struct QXLInstance {
> QXLState *st;
> };
>
> -void spice_gl_scanout(QXLInstance *instance,
> - int fd,
> - uint32_t width, uint32_t height,
> - uint32_t stride, uint32_t format,
> - int y_0_top);
> -
> -void spice_gl_draw_async(QXLInstance *instance,
> - uint32_t x, uint32_t y,
> - uint32_t w, uint32_t h,
> - uint64_t cookie);
> -
> #endif /* SPICE_QXL_H_ */
> diff --git a/server/spice-server.syms b/server/spice-server.syms
> index db7d973..7987d51 100644
> --- a/server/spice-server.syms
> +++ b/server/spice-server.syms
> @@ -170,6 +170,6 @@ global:
>
> SPICE_SERVER_0.13.1 {
> global:
> - spice_gl_scanout;
> - spice_gl_draw_async;
> + spice_qxl_gl_scanout;
> + spice_qxl_gl_draw_async;
> } SPICE_SERVER_0.12.7;
> --
> 2.5.0
>
--
Marc-André Lureau
_______________________________________________
Spice-devel mailing list
Spice-devel@xxxxxxxxxxxxxxxxxxxxx
https://lists.freedesktop.org/mailman/listinfo/spice-devel