| Message ID | 20170403114044.15762-1-lvivier@redhat.com |
|---|---|
| State | New |
| Headers | show |
On 04/03/2017 08:40 AM, Laurent Vivier wrote: > This avoids a "#ifdef HOST_WORDS_BIGENDIAN" and this is the purpose > of PIXMAN_BE_* macros. > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > --- > hw/display/virtio-gpu.c | 35 ++++++++--------------------------- > 1 file changed, 8 insertions(+), 27 deletions(-) > > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > index 9b530ab..7befcef 100644 > --- a/hw/display/virtio-gpu.c > +++ b/hw/display/virtio-gpu.c > @@ -258,41 +258,22 @@ void virtio_gpu_get_display_info(VirtIOGPU *g, > static pixman_format_code_t get_pixman_format(uint32_t virtio_gpu_format) > { > switch (virtio_gpu_format) { > -#ifdef HOST_WORDS_BIGENDIAN > case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: > - return PIXMAN_b8g8r8x8; > + return PIXMAN_BE_b8g8r8x8; > case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: > - return PIXMAN_b8g8r8a8; > + return PIXMAN_BE_b8g8r8a8; > case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: > - return PIXMAN_x8r8g8b8; > + return PIXMAN_BE_x8r8g8b8; > case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: > - return PIXMAN_a8r8g8b8; > + return PIXMAN_BE_a8r8g8b8; > case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: > - return PIXMAN_r8g8b8x8; > + return PIXMAN_BE_r8g8b8x8; > case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: > - return PIXMAN_r8g8b8a8; > + return PIXMAN_BE_r8g8b8a8; > case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: > - return PIXMAN_x8b8g8r8; > + return PIXMAN_BE_x8b8g8r8; > case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: > - return PIXMAN_a8b8g8r8; > -#else > - case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: > - return PIXMAN_x8r8g8b8; > - case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: > - return PIXMAN_a8r8g8b8; > - case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: > - return PIXMAN_b8g8r8x8; > - case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: > - return PIXMAN_b8g8r8a8; > - case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: > - return PIXMAN_x8b8g8r8; > - case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: > - return PIXMAN_a8b8g8r8; > - case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: > - return PIXMAN_r8g8b8x8; > - case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: > - return PIXMAN_r8g8b8a8; > -#endif > + return PIXMAN_BE_a8b8g8r8; > default: > return 0; > } >
On Mon, Apr 03, 2017 at 09:28:02AM -0300, Philippe Mathieu-Daudé wrote: > On 04/03/2017 08:40 AM, Laurent Vivier wrote: > > This avoids a "#ifdef HOST_WORDS_BIGENDIAN" and this is the purpose > > of PIXMAN_BE_* macros. > > > > Signed-off-by: Laurent Vivier <lvivier@redhat.com> > > Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org> > Reviewed-by: Sahid Orentino Ferdjaoui <sahid.ferdjaoui@redhat.com> > > > --- > > hw/display/virtio-gpu.c | 35 ++++++++--------------------------- > > 1 file changed, 8 insertions(+), 27 deletions(-) > > > > diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c > > index 9b530ab..7befcef 100644 > > --- a/hw/display/virtio-gpu.c > > +++ b/hw/display/virtio-gpu.c > > @@ -258,41 +258,22 @@ void virtio_gpu_get_display_info(VirtIOGPU *g, > > static pixman_format_code_t get_pixman_format(uint32_t virtio_gpu_format) > > { > > switch (virtio_gpu_format) { > > -#ifdef HOST_WORDS_BIGENDIAN > > case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: > > - return PIXMAN_b8g8r8x8; > > + return PIXMAN_BE_b8g8r8x8; > > case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: > > - return PIXMAN_b8g8r8a8; > > + return PIXMAN_BE_b8g8r8a8; > > case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: > > - return PIXMAN_x8r8g8b8; > > + return PIXMAN_BE_x8r8g8b8; > > case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: > > - return PIXMAN_a8r8g8b8; > > + return PIXMAN_BE_a8r8g8b8; > > case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: > > - return PIXMAN_r8g8b8x8; > > + return PIXMAN_BE_r8g8b8x8; > > case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: > > - return PIXMAN_r8g8b8a8; > > + return PIXMAN_BE_r8g8b8a8; > > case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: > > - return PIXMAN_x8b8g8r8; > > + return PIXMAN_BE_x8b8g8r8; > > case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: > > - return PIXMAN_a8b8g8r8; > > -#else > > - case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: > > - return PIXMAN_x8r8g8b8; > > - case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: > > - return PIXMAN_a8r8g8b8; > > - case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: > > - return PIXMAN_b8g8r8x8; > > - case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: > > - return PIXMAN_b8g8r8a8; > > - case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: > > - return PIXMAN_x8b8g8r8; > > - case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: > > - return PIXMAN_a8b8g8r8; > > - case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: > > - return PIXMAN_r8g8b8x8; > > - case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: > > - return PIXMAN_r8g8b8a8; > > -#endif > > + return PIXMAN_BE_a8b8g8r8; > > default: > > return 0; > > } > >
On Mo, 2017-04-03 at 13:40 +0200, Laurent Vivier wrote: > This avoids a "#ifdef HOST_WORDS_BIGENDIAN" and this is the purpose > of PIXMAN_BE_* macros. Added to vga queue (for 2.10). thanks, Gerd
diff --git a/hw/display/virtio-gpu.c b/hw/display/virtio-gpu.c index 9b530ab..7befcef 100644 --- a/hw/display/virtio-gpu.c +++ b/hw/display/virtio-gpu.c @@ -258,41 +258,22 @@ void virtio_gpu_get_display_info(VirtIOGPU *g, static pixman_format_code_t get_pixman_format(uint32_t virtio_gpu_format) { switch (virtio_gpu_format) { -#ifdef HOST_WORDS_BIGENDIAN case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: - return PIXMAN_b8g8r8x8; + return PIXMAN_BE_b8g8r8x8; case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: - return PIXMAN_b8g8r8a8; + return PIXMAN_BE_b8g8r8a8; case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: - return PIXMAN_x8r8g8b8; + return PIXMAN_BE_x8r8g8b8; case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: - return PIXMAN_a8r8g8b8; + return PIXMAN_BE_a8r8g8b8; case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: - return PIXMAN_r8g8b8x8; + return PIXMAN_BE_r8g8b8x8; case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: - return PIXMAN_r8g8b8a8; + return PIXMAN_BE_r8g8b8a8; case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: - return PIXMAN_x8b8g8r8; + return PIXMAN_BE_x8b8g8r8; case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: - return PIXMAN_a8b8g8r8; -#else - case VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM: - return PIXMAN_x8r8g8b8; - case VIRTIO_GPU_FORMAT_B8G8R8A8_UNORM: - return PIXMAN_a8r8g8b8; - case VIRTIO_GPU_FORMAT_X8R8G8B8_UNORM: - return PIXMAN_b8g8r8x8; - case VIRTIO_GPU_FORMAT_A8R8G8B8_UNORM: - return PIXMAN_b8g8r8a8; - case VIRTIO_GPU_FORMAT_R8G8B8X8_UNORM: - return PIXMAN_x8b8g8r8; - case VIRTIO_GPU_FORMAT_R8G8B8A8_UNORM: - return PIXMAN_a8b8g8r8; - case VIRTIO_GPU_FORMAT_X8B8G8R8_UNORM: - return PIXMAN_r8g8b8x8; - case VIRTIO_GPU_FORMAT_A8B8G8R8_UNORM: - return PIXMAN_r8g8b8a8; -#endif + return PIXMAN_BE_a8b8g8r8; default: return 0; }
This avoids a "#ifdef HOST_WORDS_BIGENDIAN" and this is the purpose of PIXMAN_BE_* macros. Signed-off-by: Laurent Vivier <lvivier@redhat.com> --- hw/display/virtio-gpu.c | 35 ++++++++--------------------------- 1 file changed, 8 insertions(+), 27 deletions(-)