From 60eab9e4f4c954b991db451aa2f3cad4c3fe27d0 Mon Sep 17 00:00:00 2001 From: espes Date: Fri, 3 Jul 2015 01:42:16 +1000 Subject: [PATCH] new texutre format --- hw/xbox/nv2a.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/hw/xbox/nv2a.c b/hw/xbox/nv2a.c index cfe866e0ae..515ada5638 100644 --- a/hw/xbox/nv2a.c +++ b/hw/xbox/nv2a.c @@ -559,7 +559,7 @@ # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_UB_D3D 0 # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_S1 1 # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_F 2 -# define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_UB_OGL 3 +# define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_UB_OGL 4 # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_S32K 5 # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_TYPE_CMP 6 # define NV097_SET_VERTEX_DATA_ARRAY_FORMAT_SIZE 0x000000F0 @@ -602,6 +602,7 @@ # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_A8R8G8B8 0x12 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8 0x19 # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_X8R8G8B8 0x1E +# define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_DEPTH_X8_Y24_FIXED 0x2E # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_DEPTH_Y16_FIXED 0x30 # define NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8B8G8R8 0x3A # define NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_A8B8G8R8 0x3F @@ -726,6 +727,8 @@ static const ColorFormatInfo kelvin_color_format_map[66] = { {2, false, GL_RED, GL_RED, GL_UNSIGNED_BYTE}, [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_X8R8G8B8] = {4, true, GL_RGB, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV}, + [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_DEPTH_X8_Y24_FIXED] = + {4, true, GL_DEPTH_COMPONENT24, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT}, [NV097_SET_TEXTURE_FORMAT_COLOR_LU_IMAGE_DEPTH_Y16_FIXED] = {2, true, GL_DEPTH_COMPONENT, GL_DEPTH_COMPONENT, GL_UNSIGNED_SHORT}, [NV097_SET_TEXTURE_FORMAT_COLOR_SZ_A8B8G8R8] =