64-bit rendering removed

This commit is contained in:
zueuk 2009-04-20 07:43:43 +00:00
parent c21d6ecbb1
commit 4998861d1e
3 changed files with 14 additions and 16 deletions

View File

@ -27,7 +27,7 @@ type
FBucketHeight: integer; FBucketHeight: integer;
FBucketWidth: integer; FBucketWidth: integer;
FBuckets64: TBucket64Array; // FBuckets64: TBucket64Array;
FBuckets48: TBucket48Array; FBuckets48: TBucket48Array;
FBuckets32: TBucket32Array; FBuckets32: TBucket32Array;
FBuckets32f: TBucket32fArray; FBuckets32f: TBucket32fArray;
@ -35,7 +35,7 @@ type
FOnProgress: TOnProgress; FOnProgress: TOnProgress;
FGetBucket: function(x, y: integer): TBucket64 of object; FGetBucket: function(x, y: integer): TBucket64 of object;
function GetBucket64(x, y: integer): TBucket64; // function GetBucket64(x, y: integer): TBucket64;
function GetBucket48(x, y: integer): TBucket64; function GetBucket48(x, y: integer): TBucket64;
function GetBucket32(x, y: integer): TBucket64; function GetBucket32(x, y: integer): TBucket64;
function GetBucket32f(x, y: integer): TBucket64; function GetBucket32f(x, y: integer): TBucket64;
@ -207,7 +207,7 @@ end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
procedure TImageMaker.SetBucketData(const Buckets: pointer; BucketWidth, BucketHeight: integer; bits: integer); procedure TImageMaker.SetBucketData(const Buckets: pointer; BucketWidth, BucketHeight: integer; bits: integer);
begin begin
FBuckets64 := TBucket64Array(Buckets); //FBuckets64 := TBucket64Array(Buckets);
FBuckets48 := TBucket48Array(Buckets); FBuckets48 := TBucket48Array(Buckets);
FBuckets32f := TBucket32fArray(Buckets); FBuckets32f := TBucket32fArray(Buckets);
FBuckets32 := TBucket32Array(Buckets); FBuckets32 := TBucket32Array(Buckets);
@ -219,7 +219,7 @@ begin
BITS_32: FGetBucket := GetBucket32; BITS_32: FGetBucket := GetBucket32;
BITS_32f: FGetBucket := GetBucket32f; BITS_32f: FGetBucket := GetBucket32f;
BITS_48: FGetBucket := GetBucket48; BITS_48: FGetBucket := GetBucket48;
BITS_64: FGetBucket := GetBucket64; //BITS_64: FGetBucket := GetBucket64;
else assert(false); else assert(false);
end; end;
end; end;
@ -560,10 +560,12 @@ end;
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
{
function TImageMaker.GetBucket64(x, y: integer): TBucket64; function TImageMaker.GetBucket64(x, y: integer): TBucket64;
begin begin
Result := FBuckets64[y][x]; Result := FBuckets64[y][x];
end; end;
}
function TImageMaker.GetBucket32(x, y: integer): TBucket64; function TImageMaker.GetBucket32(x, y: integer): TBucket64;
begin begin

View File

@ -25,7 +25,6 @@ uses
Classes, Windows, Messages, Graphics, Classes, Windows, Messages, Graphics,
ControlPoint, Render, ControlPoint, Render,
Global, RenderTypes, PngImage, Global, RenderTypes, PngImage,
Render64, Render64MT,
Render48, Render48MT, Render48, Render48MT,
Render32, Render32MT, Render32, Render32MT,
Render32f, Render32fMT; Render32f, Render32fMT;
@ -171,14 +170,14 @@ begin
0: FRenderer := TRenderer32.Create; 0: FRenderer := TRenderer32.Create;
1: FRenderer := TRenderer32f.Create; 1: FRenderer := TRenderer32f.Create;
2: FRenderer := TRenderer48.Create; 2: FRenderer := TRenderer48.Create;
3: FRenderer := TRenderer64.Create; //3: FRenderer := TRenderer64.Create;
end; end;
end else begin end else begin
case FBitsPerSample of case FBitsPerSample of
0: FRenderer := TRenderer32MM.Create; 0: FRenderer := TRenderer32MM.Create;
1: FRenderer := TRenderer32fMM.Create; 1: FRenderer := TRenderer32fMM.Create;
2: FRenderer := TRenderer48MM.Create; 2: FRenderer := TRenderer48MM.Create;
3: FRenderer := TRenderer64MM.Create; //3: FRenderer := TRenderer64MM.Create;
end; end;
FRenderer.MaxMem := MaxMem; FRenderer.MaxMem := MaxMem;
end; end;
@ -189,14 +188,14 @@ begin
0: FRenderer := TRenderer32MT.Create; 0: FRenderer := TRenderer32MT.Create;
1: FRenderer := TRenderer32fMT.Create; 1: FRenderer := TRenderer32fMT.Create;
2: FRenderer := TRenderer48MT.Create; 2: FRenderer := TRenderer48MT.Create;
3: FRenderer := TRenderer64MT.Create; //3: FRenderer := TRenderer64MT.Create;
end; end;
end else begin end else begin
case FBitsPerSample of case FBitsPerSample of
0: FRenderer := TRenderer32MT_MM.Create; 0: FRenderer := TRenderer32MT_MM.Create;
1: FRenderer := TRenderer32fMT_MM.Create; 1: FRenderer := TRenderer32fMT_MM.Create;
2: FRenderer := TRenderer48MT_MM.Create; 2: FRenderer := TRenderer48MT_MM.Create;
3: FRenderer := TRenderer64MT_MM.Create; //3: FRenderer := TRenderer64MT_MM.Create;
end; end;
FRenderer.MaxMem := MaxMem; FRenderer.MaxMem := MaxMem;
end; end;

View File

@ -27,9 +27,8 @@ type
Blue, Blue,
Count: Int64; Count: Int64;
end; end;
PBucket64 = ^TBucket64; // PBucket64 = ^TBucket64;
TBucket64Array = array of array of TBucket64; // TBucket64Array = array of array of TBucket64;
// PBucket64Array = ^PBucket64Array;
TBucket48 = packed record TBucket48 = packed record
rl: longword; rh: word; rl: longword; rh: word;
@ -39,7 +38,6 @@ type
end; end;
PBucket48 = ^TBucket48; PBucket48 = ^TBucket48;
TBucket48Array = array of array of TBucket48; TBucket48Array = array of array of TBucket48;
// PBucket48Array = ^PBucket48Array;
TBucket32f = record TBucket32f = record
Red, Red,
@ -49,7 +47,6 @@ type
end; end;
PBucket32f = ^TBucket32f; PBucket32f = ^TBucket32f;
TBucket32fArray = array of array of TBucket32f; TBucket32fArray = array of array of TBucket32f;
// PBucket32fArray = ^PBucket32fArray;
TBucket32 = Record TBucket32 = Record
Red, Red,
@ -74,8 +71,8 @@ const
BITS_32 = 0; BITS_32 = 0;
BITS_32f = 1; BITS_32f = 1;
BITS_48 = 2; BITS_48 = 2;
BITS_64 = 3; //BITS_64 = 3;
SizeOfBucket: array[0..3] of byte = (16, 16, 24, 32); SizeOfBucket: array[0..2] of byte = (16, 16, 24); //, 32);
type type
TBucketStats = record TBucketStats = record