From cb0dbdd369eb5c1eb524c0463d94b42e71c72049 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 6 Sep 2018 14:23:34 -0700 Subject: [PATCH] dri/osmesa: use preprocessor for selecting endian code paths Reviewed-by: Eric Engestrom --- src/mesa/drivers/osmesa/osmesa.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c index acf1e3739ef..f5595ae020d 100644 --- a/src/mesa/drivers/osmesa/osmesa.c +++ b/src/mesa/drivers/osmesa/osmesa.c @@ -455,10 +455,11 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, */ if (osmesa->format == OSMESA_RGBA) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { - if (_mesa_little_endian()) +#ifdef PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_R8G8B8A8_UNORM; - else +#else rb->Format = MESA_FORMAT_A8B8G8R8_UNORM; +#endif } else if (osmesa->DataType == GL_UNSIGNED_SHORT) { rb->Format = MESA_FORMAT_RGBA_UNORM16; @@ -469,10 +470,11 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, } else if (osmesa->format == OSMESA_BGRA) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { - if (_mesa_little_endian()) +#ifdef PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_B8G8R8A8_UNORM; - else +#else rb->Format = MESA_FORMAT_A8R8G8B8_UNORM; +#endif } else if (osmesa->DataType == GL_UNSIGNED_SHORT) { _mesa_warning(ctx, "Unsupported OSMesa format BGRA/GLushort"); @@ -485,10 +487,11 @@ osmesa_renderbuffer_storage(struct gl_context *ctx, struct gl_renderbuffer *rb, } else if (osmesa->format == OSMESA_ARGB) { if (osmesa->DataType == GL_UNSIGNED_BYTE) { - if (_mesa_little_endian()) +#ifdef PIPE_ARCH_LITTLE_ENDIAN rb->Format = MESA_FORMAT_A8R8G8B8_UNORM; - else +#else rb->Format = MESA_FORMAT_B8G8R8A8_UNORM; +#endif } else if (osmesa->DataType == GL_UNSIGNED_SHORT) { _mesa_warning(ctx, "Unsupported OSMesa format ARGB/GLushort"); -- 2.30.2