浏览代码

Using cmam as a memory manager

Coldzer0 1 年之前
父节点
当前提交
de9de0ebb2
共有 2 个文件被更改,包括 34 次插入8 次删除
  1. 4 2
      demo/ImGuiDemo.lpr
  2. 30 6
      demo/ImGuiDemo.lps

+ 4 - 2
demo/ImGuiDemo.lpr

@@ -31,6 +31,7 @@ Program ImGuiDemo;
 {$EndIf}
 
 Uses
+  cmem,
   SysUtils,
   sdl2,
   glad_gl,
@@ -174,12 +175,12 @@ Var
 
   Function PasAllocMem(sz: size_t; {%H-}user_data: Pointer): Pointer; Cdecl;
   Begin
-    Result := AllocMem(sz);
+    Result := cmem.Malloc(sz);
   End;
 
   Procedure PasFreeMem(ptr: Pointer; {%H-}user_data: Pointer); Cdecl;
   Begin
-    Freemem(ptr);
+    cmem.Free(ptr);
   End;
 
 Var
@@ -261,6 +262,7 @@ Begin
 
   // Enable Logging
   ImGuiCtx := ImGui.GetCurrentContext();
+  ImGuiCtx^.LogType := ImGuiLogType_File;
   ImGuiCtx^.LogEnabled := True;
 
   // Enable Keyboard Controls

+ 30 - 6
demo/ImGuiDemo.lps

@@ -3,14 +3,14 @@
   <ProjectSession>
     <PathDelim Value="\"/>
     <Version Value="12"/>
-    <BuildModes Active="Debug_windows"/>
-    <Units Count="53">
+    <BuildModes Active="Release_windows"/>
+    <Units Count="54">
       <Unit0>
         <Filename Value="ImGuiDemo.lpr"/>
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
-        <TopLine Value="28"/>
-        <CursorPos X="26" Y="54"/>
+        <TopLine Value="64"/>
+        <CursorPos X="11" Y="70"/>
         <FoldState Value=" T3iT2y1 PdiJ2a"/>
         <UsageCount Value="200"/>
         <Loaded Value="True"/>
@@ -369,11 +369,19 @@
       <Unit52>
         <Filename Value="F:\FPCross\fpcsrc\rtl\inc\cmem.pp"/>
         <EditorIndex Value="-1"/>
-        <TopLine Value="25"/>
+        <TopLine Value="155"/>
+        <CursorPos X="16" Y="53"/>
         <UsageCount Value="10"/>
       </Unit52>
+      <Unit53>
+        <Filename Value="F:\FPCross\fpcsrc\rtl\inc\heaph.inc"/>
+        <EditorIndex Value="-1"/>
+        <TopLine Value="79"/>
+        <CursorPos X="10" Y="102"/>
+        <UsageCount Value="10"/>
+      </Unit53>
     </Units>
-    <JumpHistory Count="13" HistoryIndex="12">
+    <JumpHistory Count="17" HistoryIndex="16">
       <Position1>
         <Filename Value="ImGuiDemo.lpr"/>
         <Caret Line="182" Column="23" TopLine="297"/>
@@ -426,6 +434,22 @@
         <Filename Value="ImGuiDemo.lpr"/>
         <Caret Line="54" Column="26" TopLine="28"/>
       </Position13>
+      <Position14>
+        <Filename Value="ImGuiDemo.lpr"/>
+        <Caret Line="36" Column="20" TopLine="28"/>
+      </Position14>
+      <Position15>
+        <Filename Value="ImGuiDemo.lpr"/>
+        <Caret Line="183" TopLine="23"/>
+      </Position15>
+      <Position16>
+        <Filename Value="ImGuiDemo.lpr"/>
+        <Caret Line="72" Column="25" TopLine="59"/>
+      </Position16>
+      <Position17>
+        <Filename Value="ImGuiDemo.lpr"/>
+        <Caret Line="183" TopLine="59"/>
+      </Position17>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>