From 1deda8e7584aa98c7c92374b408cc7212bc4b012 Mon Sep 17 00:00:00 2001 From: Rudolf Cornelissen Date: Wed, 19 Sep 2007 17:17:22 +0000 Subject: [PATCH] added some defines for NV50 arch, G8x. Removed the comment indicating difference between TNT and GF style setup for 3D: that's not really there. Judging from Nouveau it's still the same setup (more or less), there are just some new commands including TNL. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22254 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/graphics/nvidia/DriverInterface.h | 8 ++++++-- headers/private/graphics/nvidia/nv_acc.h | 10 +++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 17ac4d505d..2c4da6edf9 100644 --- a/headers/private/graphics/nvidia/DriverInterface.h +++ b/headers/private/graphics/nvidia/DriverInterface.h @@ -105,7 +105,10 @@ enum { G70, G71, G72, - G73 + G73, + G80, + G84, + G86 }; /* card_arch in order of date of NV chip design */ @@ -114,7 +117,8 @@ enum { NV10A, NV20A, NV30A, - NV40A + NV40A, + NV50A }; /* card info - information gathered from PINS (and other sources) */ diff --git a/headers/private/graphics/nvidia/nv_acc.h b/headers/private/graphics/nvidia/nv_acc.h index 198836959d..cf1b48a704 100644 --- a/headers/private/graphics/nvidia/nv_acc.h +++ b/headers/private/graphics/nvidia/nv_acc.h @@ -299,17 +299,13 @@ typedef struct { #define NV_SCALED_IMAGE_FROM_MEMORY_SOURCESIZE 0x0400 -/***************************************** - * 3D specific commands, TNT style setup * - *****************************************/ +/************************ + * 3D specific commands * + ************************/ #define NV4_DX5_TEXTURE_TRIANGLE_COLORKEY 0x0300 #define NV4_DX5_TEXTURE_TRIANGLE_TLVERTEX(i) 0x0400 + (i << 5) #define NV4_DX5_TEXTURE_TRIANGLE_TLVDRAWPRIM(i) 0x0600 + (i << 2) #define NV4_CONTEXT_SURFACES_ARGB_ZS_PITCH 0x0308 -/********************************************* - * 3D specific commands, GeForce style setup * - *********************************************/ - #endif