summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README2
-rw-r--r--src/voodoo_dga.c2
-rw-r--r--src/voodoo_driver.c4
-rw-r--r--src/voodoo_hardware.c8
4 files changed, 8 insertions, 8 deletions
diff --git a/README b/README
index 0eb0b90..f23423b 100644
--- a/README
+++ b/README
@@ -45,7 +45,7 @@ Voodoo2 and later
CPU to screen blit
Ultra fast fill to some alignments
Monochrome to colour expansion (cpu to screen only)
- (and they finally made the 2D and 3D state independant
+ (and they finally made the 2D and 3D state independent
if someone ever gets drunk enough to do DRI...)
Colour conversion on blit
Dither
diff --git a/src/voodoo_dga.c b/src/voodoo_dga.c
index edcde47..dda72a4 100644
--- a/src/voodoo_dga.c
+++ b/src/voodoo_dga.c
@@ -5,7 +5,7 @@
* accelerations that Glide does not expose. The Voodoo 2 hardware has
* bit blit (screen->screen, cpu->screen), some colour expansion and
* also alpha (so could do hw render even!). Also can in theory use
- * texture ram and engine to do arbitary Xv support as we have
+ * texture ram and engine to do arbitrary Xv support as we have
* colour match on the 2D blit (ie 3D blit to back, 2D blit to front)
* along with alpha on the Xv 8) and with some care rotation of Xv.
*
diff --git a/src/voodoo_driver.c b/src/voodoo_driver.c
index 6ef12ae..5584a53 100644
--- a/src/voodoo_driver.c
+++ b/src/voodoo_driver.c
@@ -5,7 +5,7 @@
* accelerations that Glide does not expose. The Voodoo 2 hardware has
* bit blit (screen->screen, cpu->screen), some colour expansion and
* also alpha (so could do hw render even!). Also can in theory use
- * texture ram and engine to do arbitary Xv support as we have
+ * texture ram and engine to do arbitrary Xv support as we have
* colour match on the 2D blit (ie 3D blit to back, 2D blit to front)
* along with alpha on the Xv 8) and with some care rotation of Xv.
*
@@ -99,7 +99,7 @@ static void VoodooDisplayPowerManagementSet(ScrnInfoPtr pScrn,
/*
* This contains the functions needed by the server after loading the
* driver module. It must be supplied, and gets added the driver list by
- * the Module Setup funtion in the dynamic case. In the static case a
+ * the Module Setup function in the dynamic case. In the static case a
* reference to this is compiled in, and this requires that the name of
* this DriverRec be an upper-case version of the driver name.
*/
diff --git a/src/voodoo_hardware.c b/src/voodoo_hardware.c
index 5a85446..59ee59b 100644
--- a/src/voodoo_hardware.c
+++ b/src/voodoo_hardware.c
@@ -120,7 +120,7 @@ static void mmio32_w_chuck(VoodooPtr pVoo, int reg, CARD32 val)
}
/*
- * Size the video RAM. Texture ram sizing is different and seperate
+ * Size the video RAM. Texture ram sizing is different and separate
* but we don't use the texture ram for 2D anyway.
*/
@@ -785,7 +785,7 @@ void VoodooClear(VoodooPtr pVoo)
mmio32_w(pVoo, 0x118, pVoo->Width);
mmio32_w(pVoo, 0x11C, pVoo->Height << 16);
- /* On entry we know Clip is set correctly so we wil clear the lot */
+ /* On entry we know Clip is set correctly so we will clear the lot */
mmio32_w(pVoo, 0x148, 0xC0C0C0); /* RGB888 black */
mmio32_w(pVoo, 0x130, 0xFFFF); /* I think ?? */
/* We want to write to screen and depth, front buffer, and no dither */
@@ -805,7 +805,7 @@ void VoodooClear(VoodooPtr pVoo)
*
* There are two banks. Bank 0 is the front buffer, bank 1 is the
* back buffer. We don't use the aux buffer. Additionally the
- * back bufer in 1024x768 with 2Mbyte cards is only a partial buffer.
+ * back buffer in 1024x768 with 2Mbyte cards is only a partial buffer.
* (No SLI yet)
*
* Not yet used (TODO: figure out the offsets for the backbuffer layout)
@@ -959,7 +959,7 @@ static void Voodoo2SubsequentScreenToScreenCopy(ScrnInfoPtr pScrn,
{
VoodooPtr pVoo = VoodooPTR(pScrn);
wait_idle(pVoo);
- /* Adjust co-ordinates for backward blits */
+ /* Adjust coordinates for backward blits */
height --; /* Adjust for fenceposting in the hardware */
width --;
if(pVoo->BlitDirY < 0)