From 224b9020ab0dffa45ae7209728da5dd6b08303e4 Mon Sep 17 00:00:00 2001
From: Rudolf Cornelissen <rudolf.cornelissen@gmail.com>
Date: Thu, 8 Dec 2005 20:03:36 +0000
Subject: [PATCH] added some defines for SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT
 (in progress).

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@15425 a95241bf-73f2-0310-859d-f6bbb57e9c96
---
 .../private/graphics/nvidia/DriverInterface.h |  3 +-
 headers/private/graphics/nvidia/nv_acc.h      | 45 ++++++++++---------
 2 files changed, 27 insertions(+), 21 deletions(-)

diff --git a/headers/private/graphics/nvidia/DriverInterface.h b/headers/private/graphics/nvidia/DriverInterface.h
index a6b62afb73..ca7655ba44 100644
--- a/headers/private/graphics/nvidia/DriverInterface.h
+++ b/headers/private/graphics/nvidia/DriverInterface.h
@@ -5,7 +5,7 @@
 	Other authors:
 	Mark Watson;
 	Apsed;
-	Rudolf Cornelissen 10/2002-11/2005.
+	Rudolf Cornelissen 10/2002-12/2005.
 */
 
 #ifndef DRIVERINTERFACE_H
@@ -78,6 +78,7 @@ enum {
 #define NV_ROP5_SOLID					0x00000000 /* 2D */
 #define NV_IMAGE_BLACK_RECTANGLE		0x00000001 /* 2D/3D */
 #define NV_IMAGE_PATTERN				0x00000002 /* 2D */
+#define NV_SCALED_IMAGE_FROM_MEMORY		0x00000003 /* 2D */
 #define NV4_SURFACE						0x00000010 /* 2D */
 #define NV10_CONTEXT_SURFACES_2D		0x00000010 /* 2D */
 #define NV_IMAGE_BLIT					0x00000011 /* 2D */
diff --git a/headers/private/graphics/nvidia/nv_acc.h b/headers/private/graphics/nvidia/nv_acc.h
index 639217ea22..e98a2518f7 100644
--- a/headers/private/graphics/nvidia/nv_acc.h
+++ b/headers/private/graphics/nvidia/nv_acc.h
@@ -1,7 +1,7 @@
 /* 
 	definitions for used nVidia acceleration engine commands.
 
-	Written by Rudolf Cornelissen 12/2004-2/2005
+	Written by Rudolf Cornelissen 12/2004-12/2005
 */
 
 #ifndef NV_ACC_H
@@ -298,26 +298,31 @@ typedef struct {
 #define NV_GENERAL_FIFO_CH7		0xe000
 
 /* sub-command offsets within FIFO channels */
-#define NV_GENERAL_DMAPUT						0x0040
-#define NV_GENERAL_DMAGET						0x0044
-#define NV_ROP5_SOLID_SETROP5					0x0300
-#define NV_IMAGE_BLACK_RECTANGLE_TOPLEFT		0x0300
-#define NV_IMAGE_PATTERN_SETCOLORFORMAT			0x0300
-#define NV_IMAGE_PATTERN_SETSHAPE				0x0308
-#define NV_IMAGE_PATTERN_SETCOLOR0				0x0310
-#define NV_IMAGE_BLIT_SOURCEORG					0x0300
+#define NV_GENERAL_DMAPUT							0x0040
+#define NV_GENERAL_DMAGET							0x0044
+#define NV_ROP5_SOLID_SETROP5						0x0300
+#define NV_IMAGE_BLACK_RECTANGLE_TOPLEFT			0x0300
+#define NV_IMAGE_PATTERN_SETCOLORFORMAT				0x0300
+#define NV_IMAGE_PATTERN_SETSHAPE					0x0308
+#define NV_IMAGE_PATTERN_SETCOLOR0					0x0310
+#define NV_IMAGE_BLIT_SOURCEORG						0x0300
 //fixme note: non-DMA acc is still using NV3_GDI_RECTANGLE_TEXT...
 //which is just as fast as NV4_GDI_RECTANGLE_TEXT, but has a hardware fault for DMA!
-#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
-//test 3D dma:
-#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 NV3_SURFACE_X_PITCH						0x0308
-#define NV4_CONTEXT_SURFACES_ARGB_ZS_PITCH		0x0308
-//end test.
+#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
+#define NV_SCALED_IMAGE_FROM_MEMORY_SETCOLORFORMAT	0x0300
+
+
+/************************
+ * 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 NV3_SURFACE_X_PITCH							0x0308
+#define NV4_CONTEXT_SURFACES_ARGB_ZS_PITCH			0x0308
 
 #endif