paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-10-23 03:51:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

* fixed small bug in hlinevesa256, getscanlinevesa25 and patternlinevesa256

Browse Source 
* small speed-up in the above procedures
This commit is contained in:
Jonas Maebe 1999-12-29 12:15:41 +00:00
parent e2892ee93a
commit 293e8aab2c
1 changed files with 74 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

93
rtl/go32v2/vesa.inc
View File

@ -471,7 +471,7 @@ end;
Procedure GetScanLineVESA256(x1, x2, y: integer; var data); {$ifndef fpc}far;{$endif} Procedure GetScanLineVESA256(x1, x2, y: integer; var data); {$ifndef fpc}far;{$endif}
var offs: Longint; var offs: Longint;
l, amount, bankrest, index, pixels: longint; l, amount, bankrest, index, pixels: longint;
x, curbank: integer; curbank: integer;
begin begin
inc(x1,StartXViewPort); inc(x1,StartXViewPort);
inc(x2,StartXViewPort); inc(x2,StartXViewPort);
@ -512,6 +512,9 @@ end;
bankrest := amount bankrest := amount
else {the rest won't fit anymore in the current window } else {the rest won't fit anymore in the current window }
bankrest := $10000 - (Offs and $ffff); bankrest := $10000 - (Offs and $ffff);
{ it is possible that by aligning, we ended up in a new }
{ bank, so set the correct bank again to make sure }
setreadbank(offs shr 16);
{$ifdef logging} {$ifdef logging}
LogLn('Rest to be read from this window: '+strf(bankrest)); LogLn('Rest to be read from this window: '+strf(bankrest));
{$endif logging} {$endif logging}
@ -538,9 +541,14 @@ end;
{$ifdef logging} {$ifdef logging}
LogLn('Leftover: '+strf(amount)+' at offset '+hexstr(offs,8)); LogLn('Leftover: '+strf(amount)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
x := offs mod bytesperline - StartXViewPort;
For l := 0 to amount - 1 do For l := 0 to amount - 1 do
WordArray(Data)[index+l] := GetPixVESA256(x+l,y); begin
{ this may cross a bank at any time, so adjust }
{ because this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setreadbank(offs shr 16);
WordArray(Data)[index+l] := mem[WinReadSeg:offs+l];
end;
amount := 0 amount := 0
End End
Until amount = 0; Until amount = 0;
@ -619,6 +627,10 @@ end;
bankrest := HLength bankrest := HLength
else {the rest won't fit anymore in the current window } else {the rest won't fit anymore in the current window }
bankrest := $10000 - (Offs and $ffff); bankrest := $10000 - (Offs and $ffff);
{ it is possible that by aligningm we ended up in a new }
{ bank, so set the correct bank again to make sure }
setwritebank(offs shr 16);
setreadbank(offs shr 16);
{$ifdef logging2} {$ifdef logging2}
LogLn('Rest to be drawn in this window: '+strf(bankrest)); LogLn('Rest to be drawn in this window: '+strf(bankrest));
{$endif logging} {$endif logging}
@ -636,9 +648,16 @@ end;
{$ifdef logging2} {$ifdef logging2}
LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8)); LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
x := offs mod bytesperline;
For l := 0 to HLength - 1 do For l := 0 to HLength - 1 do
DirectPutPixVESA256(x+l,y); begin
{ this may cross a bank at any time, so adjust }
{ becauese this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setreadbank(offs shr 16);
setwritebank(offs shr 16);
Mem[WinWriteSeg:word(offs)+l] :=
Mem[WinReadSeg:word(offs)+l] And byte(currentColor);
end;
HLength := 0 HLength := 0
End End
Until HLength = 0; Until HLength = 0;
@ -677,6 +696,10 @@ end;
bankrest := HLength bankrest := HLength
else {the rest won't fit anymore in the current window } else {the rest won't fit anymore in the current window }
bankrest := $10000 - (Offs and $ffff); bankrest := $10000 - (Offs and $ffff);
{ it is possible that by aligningm we ended up in a new }
{ bank, so set the correct bank again to make sure }
setwritebank(offs shr 16);
setreadbank(offs shr 16);
{$ifdef logging2} {$ifdef logging2}
LogLn('Rest to be drawn in this window: '+strf(bankrest)); LogLn('Rest to be drawn in this window: '+strf(bankrest));
{$endif logging} {$endif logging}
@ -694,9 +717,16 @@ end;
{$ifdef logging2} {$ifdef logging2}
LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8)); LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
x := offs mod bytesperline;
For l := 0 to HLength - 1 do For l := 0 to HLength - 1 do
DirectPutPixVESA256(x+l,y); begin
{ this may cross a bank at any time, so adjust }
{ because this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setreadbank(offs shr 16);
setwritebank(offs shr 16);
Mem[WinWriteSeg:word(offs)+l] :=
Mem[WinReadSeg:word(offs)+l] xor byte(currentColor);
end;
HLength := 0 HLength := 0
End End
Until HLength = 0; Until HLength = 0;
@ -727,6 +757,10 @@ end;
End; End;
Dec(HLength, l); Dec(HLength, l);
inc(offs, l); inc(offs, l);
{ it is possible that by aligningm we ended up in a new }
{ bank, so set the correct bank again to make sure }
setwritebank(offs shr 16);
setreadbank(offs shr 16);
{$ifdef logging2} {$ifdef logging2}
LogLn('Offset is now '+hexstr(offs,8)+', length left: '+strf(hlength)); LogLn('Offset is now '+hexstr(offs,8)+', length left: '+strf(hlength));
{$endif logging} {$endif logging}
@ -752,9 +786,16 @@ end;
{$ifdef logging2} {$ifdef logging2}
LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8)); LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
x := offs mod bytesperline;
For l := 0 to HLength - 1 do For l := 0 to HLength - 1 do
DirectPutPixVESA256(x+l,y); begin
{ this may cross a bank at any time, so adjust }
{ because this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setreadbank(offs shr 16);
setwritebank(offs shr 16);
Mem[WinWriteSeg:word(offs)+l] :=
Mem[WinReadSeg:word(offs)+l] And byte(currentColor);
end;
HLength := 0 HLength := 0
End End
Until HLength = 0; Until HLength = 0;
@ -793,6 +834,9 @@ end;
bankrest := HLength bankrest := HLength
else {the rest won't fit anymore in the current window } else {the rest won't fit anymore in the current window }
bankrest := $10000 - (Offs and $ffff); bankrest := $10000 - (Offs and $ffff);
{ it is possible that by aligningm we ended up in a new }
{ bank, so set the correct bank again to make sure }
setwritebank(offs shr 16);
{$ifdef logging2} {$ifdef logging2}
LogLn('Rest to be drawn in this window: '+strf(bankrest)+' -- '+hexstr(bankrest,8)); LogLn('Rest to be drawn in this window: '+strf(bankrest)+' -- '+hexstr(bankrest,8));
{$endif logging} {$endif logging}
@ -809,9 +853,14 @@ end;
{$ifdef logging2} {$ifdef logging2}
LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8)); LogLn('Drawing leftover: '+strf(HLength)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
x := offs mod bytesperline;
For l := 0 to HLength - 1 do For l := 0 to HLength - 1 do
DirectPutPixVESA256(x+l,y); begin
{ this may cross a bank at any time, so adjust }
{ because this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setwritebank(offs shr 16);
Mem[WinWriteSeg:word(offs)+l] := byte(mask);
end;
HLength := 0 HLength := 0
End End
Until HLength = 0; Until HLength = 0;
@ -998,7 +1047,6 @@ end;
i : smallint; i : smallint;
j : smallint; j : smallint;
OldWriteMode : word; OldWriteMode : word;
OldCurrentColor : word;
TmpFillPattern, patternPos : byte; TmpFillPattern, patternPos : byte;
begin begin
{ convert to global coordinates ... } { convert to global coordinates ... }
@ -1071,6 +1119,9 @@ end;
bankrest := amount bankrest := amount
else {the rest won't fit anymore in the current window } else {the rest won't fit anymore in the current window }
bankrest := $10000 - (Offs and $ffff); bankrest := $10000 - (Offs and $ffff);
{ it is possible that by aligningm we ended up in a new }
{ bank, so set the correct bank again to make sure }
setwritebank(offs shr 16);
{$ifdef logging} {$ifdef logging}
LogLn('Rest to be drawn in this window: '+strf(bankrest)); LogLn('Rest to be drawn in this window: '+strf(bankrest));
{$endif logging} {$endif logging}
@ -1090,17 +1141,17 @@ end;
{$ifdef logging} {$ifdef logging}
LogLn('Drawing leftover: '+strf(amount)+' at offset '+hexstr(offs,8)); LogLn('Drawing leftover: '+strf(amount)+' at offset '+hexstr(offs,8));
{$endif logging} {$endif logging}
i := offs mod bytesperline; patternPos := offs and 7;
patternPos := i and 7;
oldCurrentColor := currentColor;
For l := 0 to amount - 1 do For l := 0 to amount - 1 do
begin begin
currentColor := fill.pat[patternPos and 7]; { this may cross a bank at any time, so adjust }
DirectPutPixVESA256(i+l,y); { because this loop alwys runs for very little pixels, }
{ there's little gained by splitting it up }
setwritebank(offs shr 16);
Mem[WinWriteSeg:word(offs)+l] := fill.pat[patternPos and 7];
inc(patternPos); inc(patternPos);
end; end;
amount := 0; amount := 0;
currentColor := oldCurrentColor;
End End
Until amount = 0; Until amount = 0;
currentWriteMode := oldWriteMode; currentWriteMode := oldWriteMode;
@ -2434,7 +2485,11 @@ end;
(* (*
$Log$ $Log$
Revision 1.13 1999-12-27 12:10:57 jonas Revision 1.14 1999-12-29 12:15:41 jonas
* fixed small bug in hlinevesa256, getscanlinevesa25 and patternlinevesa256
* small speed-up in the above procedures
Revision 1.13 1999/12/27 12:10:57 jonas
* fixed VESA palrec structure * fixed VESA palrec structure
Revision 1.12 1999/12/26 10:36:00 jonas Revision 1.12 1999/12/26 10:36:00 jonas