moved acc function SCREEN_TO_SCREEN_TRANSPARENT_BLIT into engine directly. Also executing now if requested, although this function is completely untested.

git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@16058 a95241bf-73f2-0310-859d-f6bbb57e9c96

src/add-ons/accelerants/matrox/Acceleration.c

@@ -10,53 +10,8 @@
 
 #define MODULE_BIT 0x40000000
 
-// apsed, TODO ?? change interface of gx00_acc_* and use MGA pseudo DMA
-
 #include "acc_std.h"
 
-void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT(engine_token *et, scaled_blit_params *list, uint32 count) {
-	int i;
-
-	/*do each blit*/
-	i=0;
-	while (count--)
-	{
-		gx00_acc_video_blit
-		(
-			list[i].src_left,
-			list[i].src_top,
-			list[i].src_width,
-			list[i].src_height,
-			list[i].dest_left,
-			list[i].dest_top,
-			list[i].dest_width,
-			list[i].dest_height
-		);
-		i++;
-	}
-}
-
-void SCREEN_TO_SCREEN_TRANSPARENT_BLIT(engine_token *et, uint32 transparent_colour, blit_params *list, uint32 count) {
-	int i;
-
-	/*do each blit*/
-	i=0;
-	while (count--)
-	{
-		gx00_acc_transparent_blit
-		(
-			list[i].src_left,
-			list[i].src_top,
-			list[i].dest_left,
-			list[i].dest_top,
-			list[i].width,
-			list[i].height,
-			transparent_colour
-		);
-		i++;
-	}
-}
-
 void FILL_RECTANGLE(engine_token *et, uint32 colorIndex, fill_rect_params *list, uint32 count) {
 	int i;
 

src/add-ons/accelerants/matrox/be_driver_proto.h

@@ -45,11 +45,8 @@ void WAIT_ENGINE_IDLE(void);
 status_t GET_SYNC_TOKEN(engine_token *et, sync_token *st);
 status_t SYNC_TO_TOKEN(sync_token *st);
 
-void SCREEN_TO_SCREEN_TRANSPARENT_BLIT(engine_token *et, uint32 transparent_colour, blit_params *list, uint32 count);
-void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT(engine_token *et, scaled_blit_params *list, uint32 count);
 void FILL_RECTANGLE(engine_token *et, uint32 color, fill_rect_params *list, uint32 count);
 void INVERT_RECTANGLE(engine_token *et, fill_rect_params *list, uint32 count);
-
 void FILL_SPAN(engine_token *et, uint32 color, uint16 *list, uint32 count);
 
 /* video_overlay */

src/add-ons/accelerants/matrox/engine/mga_acc.c

@@ -223,14 +223,16 @@ void SCREEN_TO_SCREEN_BLIT(engine_token *et, blit_params *list, uint32 count)
 	while (count--)
 	{
 		/* find where the top and bottom are */
-		t_end = t_start = list[i].src_left + (offset * list[i].src_top) + si->engine.src_dst;
+		t_end = t_start =
+			list[i].src_left + (offset * list[i].src_top) + si->engine.src_dst;
 		t_end += list[i].width;
 
-		b_end = b_start = list[i].src_left + (offset * (list[i].src_top + list[i].height)) + si->engine.src_dst;
+		b_end = b_start =
+			list[i].src_left + (offset * (list[i].src_top + list[i].height)) + si->engine.src_dst;
 		b_end += list[i].width;
 
 		/* sgnzero bit _must_ be '0' before accessing SGN! */
-		ACCW(DWGCTL,0x00000000);
+		ACCW(DWGCTL, 0x00000000);
 
 		/*find which quadrant */
 		switch((list[i].dest_top > list[i].src_top) | ((list[i].dest_left > list[i].src_left) << 1))
@@ -267,79 +269,101 @@ void SCREEN_TO_SCREEN_BLIT(engine_token *et, blit_params *list, uint32 count)
 		ACCW(FXBNDRY,((list[i].dest_left + list[i].width) << 16) | list[i].dest_left);
 
 		/* start the blit */
-		ACCGO(DWGCTL,0x040C4018); // atype RSTR
+		ACCGO(DWGCTL, 0x040c4018); // atype RSTR
 		i++;
 	}
 }
 
 /* screen to screen tranparent blit - not sure what uses this.
  * Engine function bitblit, paragraph 4.5.7.2 */
-status_t gx00_acc_transparent_blit(uint16 xs,uint16 ys,uint16 xd,uint16 yd,uint16 w,uint16 h,uint32 colour)
+//WARNING:
+//yet untested function!!
+void SCREEN_TO_SCREEN_TRANSPARENT_BLIT(engine_token *et, uint32 transparent_colour, blit_params *list, uint32 count)
 {
 	uint32 t_start,t_end,offset;
 	uint32 b_start,b_end;
+	int i = 0;
 
-	return B_ERROR;
+	/* calc offset 'per line' */
-
-	/*find where the top,bottom and offset are*/
 	offset = (si->fbc.bytes_per_row / (si->engine.depth >> 3));
 
-	t_end = t_start = xs + (offset*ys) + si->engine.src_dst;
+	while (count--)
-	t_end += w;
-
-	b_end = b_start = xs + (offset*(ys+h)) + si->engine.src_dst;
-	b_end +=w;
-
-	/* sgnzero bit _must_ be '0' before accessing SGN! */
-	ACCW(DWGCTL,0x00000000);
-
-	/*find which quadrant */
-	switch((yd>ys)|((xd>xs)<<1))
 	{
-	case 0: /*L->R,down*/ 
+		/* find where the top and bottom are */
-		ACCW(SGN,0);
+		t_end = t_start =
+			list[i].src_left + (offset * list[i].src_top) + si->engine.src_dst;
+		t_end += list[i].width;
 
-		ACCW(AR3,t_start);
+		b_end = b_start =
-		ACCW(AR0,t_end);
+			list[i].src_left + (offset * (list[i].src_top + list[i].height)) + si->engine.src_dst;
-		ACCW(AR5,offset);
+		b_end += list[i].width;
 
-		ACCW_YDSTLEN(yd,h+1);
+		/* sgnzero bit _must_ be '0' before accessing SGN! */
-		break;
+		ACCW(DWGCTL, 0x00000000);
-	case 1: /*L->R,up*/
-		ACCW(SGN,4);
 
-		ACCW(AR3,b_start);
+		/*find which quadrant */
-		ACCW(AR0,b_end);
+		switch((list[i].dest_top > list[i].src_top) | ((list[i].dest_left > list[i].src_left) << 1))
-		ACCW(AR5,-offset);
+		{
+		case 0: /*L->R,down*/ 
+			ACCW(SGN, 0);
+			ACCW(AR3, t_start);
+			ACCW(AR0, t_end);
+			ACCW(AR5, offset);
+			ACCW_YDSTLEN(list[i].dest_top, list[i].height + 1);
+			break;
+		case 1: /*L->R,up*/
+			ACCW(SGN, 4);
+			ACCW(AR3, b_start);
+			ACCW(AR0, b_end);
+			ACCW(AR5, -offset);
+			ACCW_YDSTLEN(list[i].dest_top + list[i].height, list[i].height + 1);
+			break;
+		case 2: /*R->L,down*/
+			ACCW(SGN, 1);
+			ACCW(AR3, t_end);
+			ACCW(AR0, t_start);
+			ACCW(AR5, offset);
+			ACCW_YDSTLEN(list[i].dest_top, list[i].height + 1);
+			break;
+		case 3: /*R->L,up*/
+			ACCW(SGN, 5);
+			ACCW(AR3, b_end);
+			ACCW(AR0, b_start);
+			ACCW(AR5, -offset);
+			ACCW_YDSTLEN(list[i].dest_top + list[i].height, list[i].height + 1);
+			break;
+		}
+		ACCW(FXBNDRY,((list[i].dest_left + list[i].width) << 16) | list[i].dest_left);
 
-		ACCW_YDSTLEN(yd+h,h+1);
+		/* start the blit */
-		break;
+		ACCW(FCOL, transparent_colour);
-	case 2: /*R->L,down*/
+		ACCW(BCOL, 0xffffffff);
-		ACCW(SGN,1);
+		ACCGO(DWGCTL, 0x440c4018); // atype RSTR
-
+		i++;
-		ACCW(AR3,t_end);
-		ACCW(AR0,t_start);
-		ACCW(AR5,offset);
-
-		ACCW_YDSTLEN(yd,h+1);
-		break;
-	case 3: /*R->L,up*/
-		ACCW(SGN,5);
-
-		ACCW(AR3,b_end);
-		ACCW(AR0,b_start);
-		ACCW(AR5,-offset);
-
-		ACCW_YDSTLEN(yd+h,h+1);
-		break;
 	}
-	ACCW(FXBNDRY,((xd+w)<<16)|xd);
+}
 
-	/*do the blit*/
+/* screen to screen scaled filtered blit - i.e. scale video in memory.
-	ACCW(FCOL,colour);
+ * Engine function texture mapping for video, paragraphs 4.5.5.5 - 4.5.5.9 */
-	ACCW(BCOL,0xffffffff);
+//fixme: implement...
-	ACCGO(DWGCTL,0x440C4018); // atype RSTR
+void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT(engine_token *et, scaled_blit_params *list, uint32 count)
-	return B_OK;
+{
+	int i = 0;
+
+	while (count--)
+	{
+/*
+			list[i].src_left,
+			list[i].src_top,
+			list[i].src_width,
+			list[i].src_height,
+			list[i].dest_left,
+			list[i].dest_top,
+			list[i].dest_width,
+			list[i].dest_height
+*/
+		i++;
+	}
 }
 
 /* rectangle fill.
@@ -427,14 +451,3 @@ status_t gx00_acc_rectangle_invert(uint32 xs,uint32 xe,uint32 ys,uint32 yl,uint3
 
 	return B_OK;
 }
-
-/* screen to screen scaled filtered blit - i.e. scale video in memory.
- * Engine function texture mapping for video, paragraphs 4.5.5.5 - 4.5.5.9 */
-status_t gx00_acc_video_blit(uint16 xs,uint16 ys,uint16 ws, uint16 hs,
-	uint16 xd,uint16 yd,uint16 wd,uint16 hd)
-{
-	//fixme: implement. Used for G450/G550 Desktop TVout...
-	//fixme: see if MIL1 - G200 support this function as well...
-
-	return B_OK;
-}

src/add-ons/accelerants/matrox/engine/mga_proto.h

@@ -107,6 +107,8 @@ status_t g400_crtc2_dpms(bool display, bool h, bool v);
 status_t check_acc_capability(uint32 feature);
 status_t gx00_acc_init(void);
 void SCREEN_TO_SCREEN_BLIT(engine_token *et, blit_params *list, uint32 count);
+void SCREEN_TO_SCREEN_TRANSPARENT_BLIT(engine_token *et, uint32 transparent_colour, blit_params *list, uint32 count);
+void SCREEN_TO_SCREEN_SCALED_FILTERED_BLIT(engine_token *et, scaled_blit_params *list, uint32 count);
 status_t gx00_acc_rectangle(uint32 xs,uint32 xe,uint32 ys,uint32 yl,uint32 col);
 status_t gx00_acc_rectangle_invert(uint32 xs,uint32 xe,uint32 ys,uint32 yl,uint32 col);
 status_t gx00_acc_transparent_blit(uint16,uint16,uint16, uint16,uint16,uint16, uint32);