diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h index 6f9ec635ce..2aa4cf91dc 100644 --- a/headers/private/graphics/nvidia/DriverInterface.h +++ b/headers/private/graphics/nvidia/DriverInterface.h @@ -73,24 +73,24 @@ enum { }; /* handles to pre-defined engine commands */ -#define NV_ROP5_SOLID 0x80000000 /* 2D */ -#define NV_IMAGE_BLACK_RECTANGLE 0x80000001 /* 2D/3D */ -#define NV_IMAGE_PATTERN 0x80000002 /* 2D */ -#define NV3_SURFACE_0 0x80000003 /* 3D: old cmd */ -#define NV3_SURFACE_1 0x80000004 /* 3D: old cmd */ -#define NV3_SURFACE_2 0x80000005 /* 3D: old cmd */ -#define NV3_SURFACE_3 0x80000006 /* 3D: old cmd */ -#define NV4_CONTEXT_SURFACES_ARGB_ZS 0x80000007 /* 3D: should replace the old cmd's */ -#define NV10_CONTEXT_SURFACES_ARGB_ZS 0x80000007 /* 3D: should replace the old cmd's */ -#define NV1_IMAGE_FROM_CPU 0x80000010 /* 2D: unused, remove? */ -#define NV_IMAGE_BLIT 0x80000011 /* 2D */ -#define NV3_GDI_RECTANGLE_TEXT 0x80000012 /* 2D */ -#define NV_RENDER_D3D0_TRIANGLE_ZETA 0x80000013 /* unused (yet?) */ -#define NV4_DX5_TEXTURE_TRIANGLE 0x80000014 /* 3D */ -#define NV10_DX5_TEXTURE_TRIANGLE 0x80000014 /* 3D */ -#define NV4_DX6_MULTI_TEXTURE_TRIANGLE 0x80000015 /* unused (yet?) */ -#define NV10_DX6_MULTI_TEXTURE_TRIANGLE 0x80000015 /* unused (yet?) */ -#define NV1_RENDER_SOLID_LIN 0x80000016 /* 2D: unused */ +#define NV_ROP5_SOLID 0x00000000 /* 2D */ +#define NV_IMAGE_BLACK_RECTANGLE 0x00000001 /* 2D/3D */ +#define NV_IMAGE_PATTERN 0x00000002 /* 2D */ +#define NV3_SURFACE_0 0x00000003 /* 3D: old cmd */ +#define NV3_SURFACE_1 0x00000004 /* 3D: old cmd */ +#define NV3_SURFACE_2 0x00000005 /* 3D: old cmd */ +#define NV3_SURFACE_3 0x00000006 /* 3D: old cmd */ +#define NV4_CONTEXT_SURFACES_ARGB_ZS 0x00000007 /* 3D: should replace the old cmd's */ +#define NV10_CONTEXT_SURFACES_ARGB_ZS 0x00000007 /* 3D: should replace the old cmd's */ +#define NV1_IMAGE_FROM_CPU 0x00000010 /* 2D: unused, remove? */ +#define NV_IMAGE_BLIT 0x00000011 /* 2D */ +#define NV3_GDI_RECTANGLE_TEXT 0x00000012 /* 2D */ +#define NV_RENDER_D3D0_TRIANGLE_ZETA 0x00000013 /* unused (yet?) */ +#define NV4_DX5_TEXTURE_TRIANGLE 0x00000014 /* 3D */ +#define NV10_DX5_TEXTURE_TRIANGLE 0x00000014 /* 3D */ +#define NV4_DX6_MULTI_TEXTURE_TRIANGLE 0x00000015 /* unused (yet?) */ +#define NV10_DX6_MULTI_TEXTURE_TRIANGLE 0x00000015 /* unused (yet?) */ +#define NV1_RENDER_SOLID_LIN 0x00000016 /* 2D: unused */ /* max. number of overlay buffers */ #define MAXBUFFERS 3 @@ -194,6 +194,7 @@ typedef struct { uint32 *cmdbuffer; /* location of DMA command buffer */ uint32 put; /* */ uint32 current; /* */ + uint32 free; /* */ }dma; } engine; diff --git a/headers/private/graphics/nvidia/nv_acc.h b/headers/private/graphics/nvidia/nv_acc.h index 82654acac6..f96787dc36 100644 --- a/headers/private/graphics/nvidia/nv_acc.h +++ b/headers/private/graphics/nvidia/nv_acc.h @@ -265,4 +265,14 @@ typedef struct { typedef struct { } cmd_nv4_dx6_multi_texture_triangle;/* nv10_dx6_multi_texture_triangle is identical? */ + +/************ DMA command defines ***********/ + +#define NV_GENERAL_DMAPUT 0x0040 +#define NV_GENERAL_DMAGET 0x0044 +#define NV_ROP5_SOLID_SETROP5 0x0300 +#define NV_IMAGE_PATTERN_SETSHAPE 0x0308 +#define NV_IMAGE_PATTERN_SETCOLOR0 0x030c +#define NV_IMAGE_BLIT_SOURCEORG 0x0308 + #endif