From 8ef2b2675b43e2ada7bd5e133448e65924e697d2 Mon Sep 17 00:00:00 2001 From: Jannik Vogel Date: Thu, 27 Aug 2015 19:23:51 +0200 Subject: [PATCH] Texture formats 0x01 and 0x1B --- hw/xbox/nv2a.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c index 4416506485..f635874c2a 100644 --- a/hw/xbox/nv2a.c +++ b/hw/xbox/nv2a.c @@ -941,6 +941,7 @@ # define NV097_SET_TEXTURE_FORMAT_DIMENSIONALITY 0x000000F0 # define NV097_SET_TEXTURE_FORMAT_COLOR 0x0000FF00 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_Y8 0x00 +# define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_AY8 0x01 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A1R5G5B5 0x02 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_X1R5G5B5 0x03 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A4R4G4B4 0x04 @@ -957,6 +958,7 @@ # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_Y8 0x13 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8 0x19 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8Y8 0x1A +# define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_AY8 0x1B # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_X1R5G5B5 0x1C # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_A4R4G4B4 0x1D # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_X8R8G8B8 0x1E @@ -1181,6 +1183,9 @@ static const ColorFormatInfo kelvin_color_format_map[66] = { [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_Y8] = {1, false, GL_R8, GL_RED, GL_UNSIGNED_BYTE, {GL_RED, GL_RED, GL_RED, GL_ONE}}, + [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_AY8] = + {1, false, GL_R8, GL_RED, GL_UNSIGNED_BYTE, + {GL_RED, GL_RED, GL_RED, GL_RED}}, [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A1R5G5B5] = {2, false, GL_RGB5_A1, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_X1R5G5B5] = @@ -1220,7 +1225,9 @@ static const ColorFormatInfo kelvin_color_format_map[66] = { [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8Y8] = {2, false, GL_RG8, GL_RG, GL_UNSIGNED_BYTE, {GL_GREEN, GL_GREEN, GL_GREEN, GL_RED}}, - + [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_AY8] = + {1, true, GL_R8, GL_RED, GL_UNSIGNED_BYTE, + {GL_RED, GL_RED, GL_RED, GL_RED}}, [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_X1R5G5B5] = {2, true, GL_RGB5, GL_BGRA, GL_UNSIGNED_SHORT_1_5_5_5_REV}, [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_A4R4G4B4] =