Changeset 522 for GraphicTest/Packages/Graphics32/GR32_Rasterizers.pas

Timestamp:

Apr 17, 2019, 10:42:18 AM (5 years ago)

Author:

chronos

Message:

• Modified: Updated Graphics32 library.

Location:

GraphicTest/Packages/Graphics32

Files:

• . (modified) (1 prop)
• GR32_Rasterizers.pas (modified) (8 diffs)

GraphicTest/Packages/Graphics32/GR32_Rasterizers.pas

@@ -47 +47 @@
   Windows,
 {$ENDIF}
-  Classes, GR32, GR32_Blend, GR32_OrdinalMaps;
+  Classes, GR32, GR32_Blend;
 
 type
@@ -184 +184 @@
 
 uses
-  GR32_Resamplers, GR32_Containers, GR32_System, Math, GR32_Math, SysUtils;
+  Math, SysUtils, GR32_Math, GR32_System, GR32_LowLevel, GR32_Resamplers,
+  GR32_Containers, GR32_OrdinalMaps;
 
 type
-  TThreadPersistentAccess = class(TThreadPersistent);
+  TCustomBitmap32Access = class(TCustomBitmap32);
 
   TLineRasterizerData = record
@@ -292 +293 @@
   R: TRect;
 begin
-  UpdateCount := TThreadPersistentAccess(Dst).UpdateCount;
+  UpdateCount := TCustomBitmap32Access(Dst).UpdateCount;
   if Assigned(FSampler) then
   begin
@@ -302 +303 @@
       DoRasterize(Dst, R);
     finally
-      while TThreadPersistentAccess(Dst).UpdateCount > UpdateCount do
-        TThreadPersistentAccess(Dst).EndUpdate;
+      while TCustomBitmap32Access(Dst).UpdateCount > UpdateCount do
+        TCustomBitmap32Access(Dst).EndUpdate;
       FSampler.FinalizeSampling;
     end;
@@ -430 +431 @@
   Size := NextPowerOf2(Max(W, H));
 
-  SetLength(ForwardBuffer, Size);
+  SetLength(ForwardBuffer, Size + 1);
 
   I := 2;
-  while I < Size do
+  while I <= Size do
   begin
     ForwardBuffer[I] := ForwardBuffer[I shr 1] + 1;
@@ -452 +453 @@
     P2.X := L + P1.X;
     P2.Y := T + P1.Y;
+
     AssignColor(Dst.Bits[P2.X + P2.Y * RowSize], GetSample(P2.X, P2.Y));
 
@@ -482 +484 @@
   FUpdateRows := True;
 end;
+
+{$DEFINE UseInternalFill}
 
 procedure TProgressiveRasterizer.DoRasterize(Dst: TCustomBitmap32;
@@ -491 +495 @@
   Step: Integer;
   GetSample: TGetSampleInt;
-begin
-    GetSample := FSampler.GetSampleInt;
-    OnChanged := Dst.OnAreaChanged;
-    DoUpdate := (TThreadPersistentAccess(Dst).UpdateCount = 0) and Assigned(OnChanged);
-    W := DstRect.Right - DstRect.Left;
-    H := DstRect.Bottom - DstRect.Top;
-    J := DstRect.Top;
-    Step := 1 shl FSteps;
-    while J < DstRect.Bottom do
-    begin
-      I := DstRect.Left;
-      B := Min(J + Step, DstRect.Bottom);
-      while I < DstRect.Right - Step do
-      begin
-        Dst.FillRect(I, J, I + Step, B, GetSample(I, J));
-        Inc(I, Step);
-      end;
-      Dst.FillRect(I, J, DstRect.Right, B, GetSample(I, J));
-      if DoUpdate and FUpdateRows then
-        OnChanged(Dst, Rect(DstRect.Left, J, DstRect.Right, B), AREAINFO_RECT);
-      Inc(J, Step);
-    end;
-    if DoUpdate and (not FUpdateRows) then OnChanged(Dst, DstRect, AREAINFO_RECT);
-
-    Shift := FSteps;
-    while Step > 1 do
-    begin
-      Dec(Shift);
-      Step := Step div 2;
-      Wk := W div Step - 1;
-      Hk := H div Step;
-      for J := 0 to Hk do
-      begin
-        Y := DstRect.Top + J shl Shift;
-        B := Min(Y + Step, DstRect.Bottom);
-        if Odd(J) then
-          for I := 0 to Wk do
+
+{$IFDEF UseInternalFill}
+  Bits: PColor32Array;
+
+procedure IntFillRect(X1, Y1, X2, Y2: Integer; C: TColor32);
+var
+  Y: Integer;
+  P: PColor32Array;
+begin
+  for Y := Y1 to Y2 - 1 do
+  begin
+    P := Pointer(@Bits[Y * W]);
+    FillLongword(P[X1], X2 - X1, C);
+  end;
+end;
+{$ENDIF}
+
+begin
+  GetSample := FSampler.GetSampleInt;
+  OnChanged := Dst.OnAreaChanged;
+{$IFDEF UseInternalFill}
+  Bits := Dst.Bits;
+{$ENDIF}
+  DoUpdate := (TCustomBitmap32Access(Dst).UpdateCount = 0) and Assigned(OnChanged);
+  W := DstRect.Right - DstRect.Left;
+  H := DstRect.Bottom - DstRect.Top;
+  J := DstRect.Top;
+  Step := 1 shl FSteps;
+  while J < DstRect.Bottom do
+  begin
+    I := DstRect.Left;
+    B := Min(J + Step, DstRect.Bottom);
+    while I < DstRect.Right - Step do
+    begin
+      {$IFDEF UseInternalFill}
+      IntFillRect(I, J, I + Step, B, GetSample(I, J));
+      {$ELSE}
+      Dst.FillRect(I, J, I + Step, B, GetSample(I, J));
+      {$ENDIF}
+      Inc(I, Step);
+    end;
+    {$IFDEF UseInternalFill}
+    IntFillRect(I, J, DstRect.Right, B, GetSample(I, J));
+    if DoUpdate and FUpdateRows then
+      OnChanged(Dst, Rect(DstRect.Left, J, DstRect.Right, B), AREAINFO_RECT);
+    {$ELSE}
+    Dst.FillRect(I, J, DstRect.Right, B, GetSample(I, J));
+    {$ENDIF}
+    Inc(J, Step);
+  end;
+  if DoUpdate and (not FUpdateRows) then OnChanged(Dst, DstRect, AREAINFO_RECT);
+
+  Shift := FSteps;
+  while Step > 1 do
+  begin
+    Dec(Shift);
+    Step := Step div 2;
+    Wk := W div Step - 1;
+    Hk := H div Step;
+    for J := 0 to Hk do
+    begin
+      Y := DstRect.Top + J shl Shift;
+      B := Min(Y + Step, DstRect.Bottom);
+      if Odd(J) then
+        for I := 0 to Wk do
+        begin
+          X := DstRect.Left + I shl Shift;
+          {$IFDEF UseInternalFill}
+          IntFillRect(X, Y, X + Step, B, GetSample(X, Y));
+          {$ELSE}
+          Dst.FillRect(X, Y, X + Step, B, GetSample(X, Y));
+          {$ENDIF}
+        end
+      else
+        for I := 0 to Wk do
+          if Odd(I) then
           begin
             X := DstRect.Left + I shl Shift;
+            {$IFDEF UseInternalFill}
+            IntFillRect(X, Y, X + Step, B, GetSample(X, Y));
+            {$ELSE}
             Dst.FillRect(X, Y, X + Step, B, GetSample(X, Y));
-          end
-        else
-          for I := 0 to Wk do
-            if Odd(I) then
-            begin
-              X := DstRect.Left + I shl Shift;
-              Dst.FillRect(X, Y, X + Step, B, GetSample(X, Y));
-            end;
-        X := DstRect.Left + Wk shl Shift;
-        Dst.FillRect(X, Y, DstRect.Right, B, GetSample(X, Y));
-        if FUpdateRows and DoUpdate then
-          OnChanged(Dst, Rect(DstRect.Left, Y, DstRect.Right, B), AREAINFO_RECT);
-      end;
-      if DoUpdate and (not FUpdateRows) then OnChanged(Dst, DstRect, AREAINFO_RECT);
-    end;
+            {$ENDIF}
+          end;
+      X := DstRect.Left + Wk shl Shift;
+      {$IFDEF UseInternalFill}
+      IntFillRect(X, Y, DstRect.Right, B, GetSample(X, Y));
+      if FUpdateRows and DoUpdate then
+        OnChanged(Dst, Rect(DstRect.Left, Y, DstRect.Right, B), AREAINFO_RECT);
+      {$ELSE}
+      Dst.FillRect(X, Y, DstRect.Right, B, GetSample(X, Y));
+      {$ENDIF}
+    end;
+    if DoUpdate and (not FUpdateRows) then OnChanged(Dst, DstRect, AREAINFO_RECT);
+  end;
 end;