From fb4a54fc4cf0c6b34ec977b7ca4b7146bb74e3b1 Mon Sep 17 00:00:00 2001 From: James Benton Date: Sun, 21 Oct 2018 15:24:25 +0100 Subject: [PATCH] Rename GX2_SQ_SELMASK macro to GX2_SEL_MASK. --- include/gx2/utils.h | 2 +- libraries/libwhb/src/gfx_shader.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/include/gx2/utils.h b/include/gx2/utils.h index 649ec9d..2a0b61f 100644 --- a/include/gx2/utils.h +++ b/include/gx2/utils.h @@ -22,7 +22,7 @@ typedef enum GX2_SQ_SEL GX2_SQ_SEL_MASK = 7, } GX2_SQ_SEL; -#define GX2_SQ_SEL_MASK(x, y, z, w) (((x) << 24) | ((y) << 16) | ((z) << 8) | (w)) +#define GX2_SEL_MASK(x, y, z, w) (((x) << 24) | ((y) << 16) | ((z) << 8) | (w)) #ifdef __cplusplus } diff --git a/libraries/libwhb/src/gfx_shader.c b/libraries/libwhb/src/gfx_shader.c index c566e25..3c1ee6c 100644 --- a/libraries/libwhb/src/gfx_shader.c +++ b/libraries/libwhb/src/gfx_shader.c @@ -219,24 +219,24 @@ GfxGetAttribFormatSel(GX2AttribFormat format) case GX2_ATTRIB_FORMAT_SNORM_8: case GX2_ATTRIB_FORMAT_SINT_8: case GX2_ATTRIB_FORMAT_FLOAT_32: - return GX2_SQ_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); case GX2_ATTRIB_FORMAT_UNORM_8_8: case GX2_ATTRIB_FORMAT_UINT_8_8: case GX2_ATTRIB_FORMAT_SNORM_8_8: case GX2_ATTRIB_FORMAT_SINT_8_8: case GX2_ATTRIB_FORMAT_FLOAT_32_32: - return GX2_SQ_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_0, GX2_SQ_SEL_1); case GX2_ATTRIB_FORMAT_FLOAT_32_32_32: - return GX2_SQ_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_1); + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_1); case GX2_ATTRIB_FORMAT_UNORM_8_8_8_8: case GX2_ATTRIB_FORMAT_UINT_8_8_8_8: case GX2_ATTRIB_FORMAT_SNORM_8_8_8_8: case GX2_ATTRIB_FORMAT_SINT_8_8_8_8: case GX2_ATTRIB_FORMAT_FLOAT_32_32_32_32: - return GX2_SQ_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_W); + return GX2_SEL_MASK(GX2_SQ_SEL_X, GX2_SQ_SEL_Y, GX2_SQ_SEL_Z, GX2_SQ_SEL_W); break; default: - return GX2_SQ_SEL_MASK(GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); + return GX2_SEL_MASK(GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_0, GX2_SQ_SEL_1); } }