i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

added overlay upscaling. Downscaling not yet supported. Set the temporary max width to 384 so PAL MPEG1 should display OK (will be a calculated setting later). Enabled overlay support now, although it might not work on all cards. If you test it, please let me know what happens. Bumped version to 0.11.

Browse Source 
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14189 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Rudolf Cornelissen
2005-09-15 17:26:48 +00:00
parent 3c9e128418
commit 83cb01f0cd
3 changed files with 50 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/accelerants/via/Overlay.c
+5 -22
View File
@@ -440,29 +440,12 @@ status_t GET_OVERLAY_CONSTRAINTS
oc->window.height.max = dm->virtual_height; oc->window.height.max = dm->virtual_height;
} }
/* GeForce scaling restrictions */ /* VIA scaling restrictions */
switch (si->ps.card_arch) /* VIA has a 'tricked' 1/16 minimum */
{ oc->h_scale.min = 0.0625;
case NV04A: oc->v_scale.min = 0.0625;
/* Riva128-TNT2 series have an old BES engine... */
oc->h_scale.min = 1.0;
oc->v_scale.min = 1.0;
break;
case NV30A:
case NV40A:
/* GeForceFX series and up have a new BES engine... */
oc->h_scale.min = 0.5;
oc->v_scale.min = 0.5;
/* NV31 (confirmed GeForceFX 5600) has NV20A scaling limits!
* So let it fall through... */
if (si->ps.card_type != NV31) break;
default:
/* the rest in between... */
oc->h_scale.min = 0.125;
oc->v_scale.min = 0.125;
break;
}
/* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */ /* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */
//checkout.. (fixme)
oc->h_scale.max = 8.0; oc->h_scale.max = 8.0;
oc->v_scale.max = 8.0; oc->v_scale.max = 8.0;
src/add-ons/accelerants/via/engine/bes.c
+44 -83
View File
@@ -72,9 +72,7 @@ bool eng_bes_chk_bandwidth()
break; break;
} }
//temp, until overlay works: return true;
// return true;
return false;
} }
/* move the overlay output window in virtualscreens */ /* move the overlay output window in virtualscreens */
@@ -449,6 +447,12 @@ BESW(VID1_COLSPAC2, 0x0a0a2c00);
//BESW(VID1_COLSPAC1, 0x13000ded); //BESW(VID1_COLSPAC1, 0x13000ded);
//BESW(VID1_COLSPAC2, 0x13171000); //BESW(VID1_COLSPAC2, 0x13171000);
//rud: via special: fifo depth is $20 (b0-5), threshold $10 (b8-13), prethreshold $1d (b24-29)
//pre rev 0x10:
BESW(VID1_FIFO, 0x1d00101f);
//rev 0x10 and later:
// BESW(VID1_FIFO, 0x3800383f);
if (si->ps.card_arch < NV10A) if (si->ps.card_arch < NV10A)
{ {
/* disable overlay ints (b0 = buffer 0, b4 = buffer 1) */ /* disable overlay ints (b0 = buffer 0, b4 = buffer 1) */
@@ -518,7 +522,10 @@ status_t eng_configure_bes
uint32 ifactor; uint32 ifactor;
/* copy of overlay view which has checked valid values */ /* copy of overlay view which has checked valid values */
overlay_view my_ov; overlay_view my_ov;
/* true if scaling needed */
bool scale_x, scale_y;
/* for computing scaling register value */
uint32 scaleval;
/************************************************************************************** /**************************************************************************************
*** copy, check and limit if needed the user-specified view into the intput bitmap *** *** copy, check and limit if needed the user-specified view into the intput bitmap ***
@@ -586,7 +593,7 @@ status_t eng_configure_bes
ifactor = (((uint32)(my_ov.width - intrep)) << 16) / (ow->width - intrep); ifactor = (((uint32)(my_ov.width - intrep)) << 16) / (ow->width - intrep);
/* correct factor to prevent most-right visible 'line' from distorting */ /* correct factor to prevent most-right visible 'line' from distorting */
ifactor -= (1 << 2); ifactor -= (1 << 5);
hiscalv = ifactor; hiscalv = ifactor;
/* save for eng_bes_calc_move_overlay() */ /* save for eng_bes_calc_move_overlay() */
si->overlay.h_ifactor = ifactor; si->overlay.h_ifactor = ifactor;
@@ -594,48 +601,26 @@ status_t eng_configure_bes
/* check scaling factor (and modify if needed) to be within scaling limits */ /* check scaling factor (and modify if needed) to be within scaling limits */
/* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */ /* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */
//fixme: checkout...
if (hiscalv < 0x00002000) if (hiscalv < 0x00002000)
{ {
/* (non-inverse) factor too large, set factor to max. valid value */ /* (non-inverse) factor too large, set factor to max. valid value */
hiscalv = 0x00002000; hiscalv = 0x00002000;
LOG(4,("Overlay: horizontal scaling factor too large, clamping at %f\n", (float)65536 / hiscalv)); LOG(4,("Overlay: horizontal scaling factor too large, clamping at %f\n", (float)65536 / hiscalv));
} }
switch (si->ps.card_arch) /* VIA has a 'downscaling' limit of 1.0
* (11bit register with 0.11 format value, with special 1.0 scaling factor setting) */
//fixme: add downscaling 'trick' solution as supported by VIA (1/16 is min. size).
scale_x = true;
if (hiscalv > 0x00010000)
{ {
case NV04A: /* (non-inverse) factor too small, set factor to min. valid value */
/* Riva128-TNT2 series have a 'downscaling' limit of 1.000489 hiscalv = 0x00010000;
* (16bit register with 0.11 format value) */ scale_x = false;
if (hiscalv > 0x0000ffff) LOG(4,("Overlay: horizontal scaling factor too small, clamping at %f\n", (float)2048 / (hiscalv >> 5)));
{
/* (non-inverse) factor too small, set factor to min. valid value */
hiscalv = 0x0000ffff;
LOG(4,("Overlay: horizontal scaling factor too small, clamping at %f\n", (float)2048 / (hiscalv >> 5)));
}
break;
case NV30A:
case NV40A:
/* GeForceFX series and up have a downscaling limit of 0.5 (except NV31!) */
if ((hiscalv > (2 << 16)) && (si->ps.card_type != NV31))
{
/* (non-inverse) factor too small, set factor to min. valid value */
hiscalv = (2 << 16);
LOG(4,("Overlay: horizontal scaling factor too small, clamping at %f\n", (float)65536 / hiscalv));
}
/* NV31 (confirmed GeForceFX 5600) has NV20A scaling limits!
* So let it fall through... */
if (si->ps.card_type != NV31) break;
default:
/* the rest has a downscaling limit of 0.125 */
if (hiscalv > (8 << 16))
{
/* (non-inverse) factor too small, set factor to min. valid value */
hiscalv = (8 << 16);
LOG(4,("Overlay: horizontal scaling factor too small, clamping at %f\n", (float)65536 / hiscalv));
}
break;
} }
/* AND below is required by hardware */ /* AND below is required by hardware */
hiscalv &= 0x001ffffc; hiscalv &= 0x0000ffe0;
/****************************** /******************************
@@ -676,7 +661,7 @@ status_t eng_configure_bes
ifactor = (((uint32)(my_ov.height - intrep)) << 16) / (ow->height - intrep); ifactor = (((uint32)(my_ov.height - intrep)) << 16) / (ow->height - intrep);
/* correct factor to prevent lowest visible line from distorting */ /* correct factor to prevent lowest visible line from distorting */
ifactor -= (1 << 2); ifactor -= (1 << 6);
LOG(4,("Overlay: vertical scaling factor is %f\n", (float)65536 / ifactor)); LOG(4,("Overlay: vertical scaling factor is %f\n", (float)65536 / ifactor));
/* preserve ifactor for source positioning calculations later on */ /* preserve ifactor for source positioning calculations later on */
@@ -686,48 +671,26 @@ status_t eng_configure_bes
/* check scaling factor (and modify if needed) to be within scaling limits */ /* check scaling factor (and modify if needed) to be within scaling limits */
/* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */ /* all cards have a upscaling limit of 8.0 (see official nVidia specsheets) */
//fixme: checkout...
if (viscalv < 0x00002000) if (viscalv < 0x00002000)
{ {
/* (non-inverse) factor too large, set factor to max. valid value */ /* (non-inverse) factor too large, set factor to max. valid value */
viscalv = 0x00002000; viscalv = 0x00002000;
LOG(4,("Overlay: vertical scaling factor too large, clamping at %f\n", (float)65536 / viscalv)); LOG(4,("Overlay: vertical scaling factor too large, clamping at %f\n", (float)65536 / viscalv));
} }
switch (si->ps.card_arch) /* VIA has a 'downscaling' limit of 1.0
* (10bit register with 0.10 format value, with special 1.0 scaling factor setting) */
//fixme: add downscaling 'trick' solution as supported by VIA (1/16 is min. size).
scale_y = true;
if (viscalv > 0x00010000)
{ {
case NV04A: /* (non-inverse) factor too small, set factor to min. valid value */
/* Riva128-TNT2 series have a 'downscaling' limit of 1.000489 viscalv = 0x00010000;
* (16bit register with 0.11 format value) */ scale_y = false;
if (viscalv > 0x0000ffff) LOG(4,("Overlay: vertical scaling factor too small, clamping at %f\n", (float)1024 / (viscalv >> 6)));
{
/* (non-inverse) factor too small, set factor to min. valid value */
viscalv = 0x0000ffff;
LOG(4,("Overlay: vertical scaling factor too small, clamping at %f\n", (float)2048 / (viscalv >> 5)));
}
break;
case NV30A:
case NV40A:
/* GeForceFX series and up have a downscaling limit of 0.5 (except NV31!) */
if ((viscalv > (2 << 16)) && (si->ps.card_type != NV31))
{
/* (non-inverse) factor too small, set factor to min. valid value */
viscalv = (2 << 16);
LOG(4,("Overlay: vertical scaling factor too small, clamping at %f\n", (float)65536 / viscalv));
}
/* NV31 (confirmed GeForceFX 5600) has NV20A scaling limits!
* So let it fall through... */
if (si->ps.card_type != NV31) break;
default:
/* the rest has a downscaling limit of 0.125 */
if (viscalv > (8 << 16))
{
/* (non-inverse) factor too small, set factor to min. valid value */
viscalv = (8 << 16);
LOG(4,("Overlay: vertical scaling factor too small, clamping at %f\n", (float)65536 / viscalv));
}
break;
} }
/* AND below is required by hardware */ /* AND below is required by hardware */
viscalv &= 0x001ffffc; viscalv &= 0x0000ffc0;
/******************************************************************************** /********************************************************************************
@@ -817,10 +780,14 @@ BESW(VID1_MINI_CTL, 0);
/* setup output window size */ /* setup output window size */
BESW(VID1_SIZE, (((moi.hcoordv & 0x0000ffff) << 16) | (moi.vcoordv & 0x0000ffff))); BESW(VID1_SIZE, (((moi.hcoordv & 0x0000ffff) << 16) | (moi.vcoordv & 0x0000ffff)));
/* setup horizontal and vertical scaling */ /* setup horizontal and vertical scaling:
// BESW(NV04_ISCALVH, (((viscalv << 16) >> 5) | (hiscalv >> 5))); * setup horizontal scaling enable (b31), setup vertical scaling enable (b15).
//fixme: scaling 1x * Note:
BESW(VID1_ZOOM, 0); * Vertical scaling has a different resolution than horizontal scaling(!). */
scaleval = 0x00000000;
if (scale_x) scaleval |= 0x80000000;
if (scale_y) scaleval |= 0x00008000;
BESW(VID1_ZOOM, (scaleval | ((hiscalv << 16) >> 5) | (viscalv >> 6)));
/* enable vertical filtering (b0) */ /* enable vertical filtering (b0) */
// BESW(NV04_CTRL_V, 0x00000001); // BESW(NV04_CTRL_V, 0x00000001);
@@ -842,13 +809,7 @@ BESW(VID1_MINI_CTL, 0);
//rud: add from MGA driver: horizontal last position in source: (also update on left+right clips!) //rud: add from MGA driver: horizontal last position in source: (also update on left+right clips!)
//max = 0x3ff BYTES(!) //max = 0x3ff BYTES(!)
//test:(fixme!) //test:(fixme!)
BESW(VID1_FETCH, (0x028 << 20));//mpeg1 temp tst. (320 pixels) BESW(VID1_FETCH, (0x030 << 20));//mpeg1 temp tst. (384 pixels)
//rud: via special: fifo depth is $20 (b0-5), threshold $10 (b8-13), prethreshold $1d (b24-29)
//pre rev 0x10:
BESW(VID1_FIFO, 0x1d00101f);
//rev 0x10 and later:
// BESW(VID1_FIFO, 0x3800383f);
/************************** /**************************
*** setup color keying *** *** setup color keying ***
src/add-ons/accelerants/via/engine/general.c
+1 -1
View File
@@ -90,7 +90,7 @@ status_t eng_general_powerup()
{ {
status_t status; status_t status;
LOG(1,("POWERUP: Haiku VIA Accelerant 0.10 running.\n")); LOG(1,("POWERUP: Haiku VIA Accelerant 0.11 running.\n"));
/* preset no laptop */ /* preset no laptop */
si->ps.laptop = false; si->ps.laptop = false;