Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

using NV4_GDI_RECTANGLE_TEXT instead of the older NV3 version for DMA acc. Seems like the old one can't be used with DMA (or I am hitting my limited knowledge on nVidia's Hash-table again..)

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/trunk/current@11002 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen 2005-01-24 11:16:39 +00:00
parent 34b1362959
commit 940dbde600
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
headers/private/graphics/nvidia/DriverInterface.h
View File

@ -89,7 +89,12 @@ enum {
#define NV10_CONTEXT_SURFACES_2D 0x00000010 /* 2D */
#define NV1_IMAGE_FROM_CPU 0x00000010 /* 2D: unused, remove? */
#define NV_IMAGE_BLIT 0x00000011 /* 2D */
//fixme: lose NV3_GDI_RECTANGLE_TEXT later on? DMA does not work with it..
//non-dma:
#define NV3_GDI_RECTANGLE_TEXT 0x00000012 /* 2D */
//dma:
#define NV4_GDI_RECTANGLE_TEXT 0x00000012 /* 2D */
//end fixme.
#define NV_RENDER_D3D0_TRIANGLE_ZETA 0x00000013 /* unused (yet?) */
#define NV4_DX5_TEXTURE_TRIANGLE 0x00000014 /* 3D */
#define NV10_DX5_TEXTURE_TRIANGLE 0x00000014 /* 3D */

8
headers/private/graphics/nvidia/nv_acc.h
View File

@ -60,6 +60,7 @@ typedef struct {
uint32 HeightWidth; /* b0-15 is width, b16-31 is height */
} cmd_nv_image_blit;
//fixme: using nv4_gdi_rectangle_text for DMA acc. Differs slightly from this one!
typedef struct {
uint32 reserved00[0x0004];
uint16 FifoFree; /* little endian (FIFO internal register) */
@ -304,9 +305,10 @@ typedef struct {
#define NV_IMAGE_PATTERN_SETSHAPE 0x0308
#define NV_IMAGE_PATTERN_SETCOLOR0 0x0310
#define NV_IMAGE_BLIT_SOURCEORG 0x0300
#define NV3_GDI_RECTANGLE_TEXT_SETCOLORFORMAT 0x0300
#define NV3_GDI_RECTANGLE_TEXT_COLOR1A 0x03fc
#define NV3_GDI_RECTANGLE_TEXT_UCR0_LEFTTOP 0x0400
//fixme note: non-DMA acc is still using NV3_GDI_RECTANGLE_TEXT...
#define NV4_GDI_RECTANGLE_TEXT_SETCOLORFORMAT 0x0300
#define NV4_GDI_RECTANGLE_TEXT_COLOR1A 0x03fc
#define NV4_GDI_RECTANGLE_TEXT_UCR0_LEFTTOP 0x0400
#define NV4_SURFACE_FORMAT 0x0300
#endif