opengl
/
Vulkan
1
0
Fork 0
Código Incidencias 0 Pull Requests 0 Lanzamientos 0 Wiki Actividad
Explorar el Código

* fixed some small bugs

master
erju hace 10 años
padre
b5fad52964
commit
68ac6aa048
Se han modificado 3 ficheros con 69 adiciones y 70 borrados
Unificar vista
Opciones de diferencias
Mostrar estadísticas Descargar archivo de parche Descargar archivo de diferencias
  1. +2
    -4
      projects/Vulkan.pas
  2. +66
    -65
      projects/triangle/triangle.lps
  3. +1
    -1
      projects/triangle/uMainForm.pas

+ 2
- 4
projects/Vulkan.pas Ver fichero

@@ -4827,16 +4827,14 @@ var success: Boolean;
begin begin
FinalizeVulkan; FinalizeVulkan;
vkLibHandle := vkLoadLibrary(aLibName); vkLibHandle := vkLoadLibrary(aLibName);
success := (vkLibHandle <> InvalidLibHandle);
if not success then
result := (vkLibHandle <> InvalidLibHandle);
if not result then
exit; exit;
vkCreateInstance := TvkCreateInstance (GetProcAddress('vkCreateInstance')); vkCreateInstance := TvkCreateInstance (GetProcAddress('vkCreateInstance'));
vkGetInstanceProcAddr := TvkGetInstanceProcAddr (GetProcAddress('vkGetInstanceProcAddr')); vkGetInstanceProcAddr := TvkGetInstanceProcAddr (GetProcAddress('vkGetInstanceProcAddr'));
vkEnumerateInstanceExtensionProperties := TvkEnumerateInstanceExtensionProperties (GetProcAddress('vkEnumerateInstanceExtensionProperties')); vkEnumerateInstanceExtensionProperties := TvkEnumerateInstanceExtensionProperties (GetProcAddress('vkEnumerateInstanceExtensionProperties'));
vkEnumerateInstanceLayerProperties := TvkEnumerateInstanceLayerProperties (GetProcAddress('vkEnumerateInstanceLayerProperties')); vkEnumerateInstanceLayerProperties := TvkEnumerateInstanceLayerProperties (GetProcAddress('vkEnumerateInstanceLayerProperties'));

result := success;
end; end;


function LoadInstanceCommands(const aInstance: VkInstance): TVkInstanceCommands; function LoadInstanceCommands(const aInstance: VkInstance): TVkInstanceCommands;


+ 66
- 65
projects/triangle/triangle.lps Ver fichero

@@ -8,9 +8,10 @@
<Unit0> <Unit0>
<Filename Value="triangle.lpr"/> <Filename Value="triangle.lpr"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="-1"/>
<CursorPos X="20" Y="11"/>
<EditorIndex Value="3"/>
<CursorPos Y="24"/>
<UsageCount Value="126"/> <UsageCount Value="126"/>
<Loaded Value="True"/>
</Unit0> </Unit0>
<Unit1> <Unit1>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
@@ -18,10 +19,9 @@
<ComponentName Value="MainForm"/> <ComponentName Value="MainForm"/>
<HasResources Value="True"/> <HasResources Value="True"/>
<ResourceBaseClass Value="Form"/> <ResourceBaseClass Value="Form"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="2"/> <EditorIndex Value="2"/>
<TopLine Value="1105"/>
<CursorPos X="28" Y="1131"/>
<TopLine Value="172"/>
<CursorPos X="40" Y="1078"/>
<ExtraEditorCount Value="1"/> <ExtraEditorCount Value="1"/>
<ExtraEditor1> <ExtraEditor1>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
@@ -35,9 +35,10 @@
<Unit2> <Unit2>
<Filename Value="..\Vulkan.pas"/> <Filename Value="..\Vulkan.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="11"/>
<TopLine Value="3097"/>
<CursorPos X="3" Y="3113"/>
<IsVisibleTab Value="True"/>
<EditorIndex Value="12"/>
<TopLine Value="4816"/>
<CursorPos Y="4838"/>
<ExtraEditorCount Value="1"/> <ExtraEditorCount Value="1"/>
<ExtraEditor1> <ExtraEditor1>
<EditorIndex Value="-1"/> <EditorIndex Value="-1"/>
@@ -50,7 +51,7 @@
<Unit3> <Unit3>
<Filename Value="..\utils\uvkuInstance.pas"/> <Filename Value="..\utils\uvkuInstance.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="7"/>
<EditorIndex Value="8"/>
<TopLine Value="39"/> <TopLine Value="39"/>
<CursorPos X="21" Y="52"/> <CursorPos X="21" Y="52"/>
<UsageCount Value="124"/> <UsageCount Value="124"/>
@@ -91,7 +92,7 @@
<Unit8> <Unit8>
<Filename Value="..\utils\uvkuDeviceFactory.pas"/> <Filename Value="..\utils\uvkuDeviceFactory.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="8"/>
<EditorIndex Value="9"/>
<TopLine Value="353"/> <TopLine Value="353"/>
<CursorPos Y="385"/> <CursorPos Y="385"/>
<UsageCount Value="110"/> <UsageCount Value="110"/>
@@ -123,7 +124,7 @@
<Unit12> <Unit12>
<Filename Value="..\utils\uvkuSwapChain.pas"/> <Filename Value="..\utils\uvkuSwapChain.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="5"/>
<EditorIndex Value="6"/>
<TopLine Value="73"/> <TopLine Value="73"/>
<CursorPos X="24" Y="81"/> <CursorPos X="24" Y="81"/>
<UsageCount Value="94"/> <UsageCount Value="94"/>
@@ -147,7 +148,7 @@
<Unit15> <Unit15>
<Filename Value="..\utils\uvkuImage.pas"/> <Filename Value="..\utils\uvkuImage.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="3"/>
<EditorIndex Value="4"/>
<TopLine Value="166"/> <TopLine Value="166"/>
<CursorPos X="24" Y="198"/> <CursorPos X="24" Y="198"/>
<UsageCount Value="90"/> <UsageCount Value="90"/>
@@ -236,7 +237,7 @@
<Unit26> <Unit26>
<Filename Value="..\utils\uvkuCommandBuffer.pas"/> <Filename Value="..\utils\uvkuCommandBuffer.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="10"/>
<EditorIndex Value="11"/>
<TopLine Value="198"/> <TopLine Value="198"/>
<CursorPos X="24" Y="198"/> <CursorPos X="24" Y="198"/>
<UsageCount Value="83"/> <UsageCount Value="83"/>
@@ -245,7 +246,7 @@
<Unit27> <Unit27>
<Filename Value="..\utils\uvkuQueue.pas"/> <Filename Value="..\utils\uvkuQueue.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="4"/>
<EditorIndex Value="5"/>
<TopLine Value="75"/> <TopLine Value="75"/>
<CursorPos X="24" Y="107"/> <CursorPos X="24" Y="107"/>
<UsageCount Value="83"/> <UsageCount Value="83"/>
@@ -254,7 +255,7 @@
<Unit28> <Unit28>
<Filename Value="..\utils\VulkanUtils.pas"/> <Filename Value="..\utils\VulkanUtils.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="9"/>
<EditorIndex Value="10"/>
<TopLine Value="125"/> <TopLine Value="125"/>
<CursorPos X="75" Y="134"/> <CursorPos X="75" Y="134"/>
<UsageCount Value="82"/> <UsageCount Value="82"/>
@@ -420,7 +421,7 @@
<Unit49> <Unit49>
<Filename Value="..\utils\uvkuSemaphore.pas"/> <Filename Value="..\utils\uvkuSemaphore.pas"/>
<IsPartOfProject Value="True"/> <IsPartOfProject Value="True"/>
<EditorIndex Value="6"/>
<EditorIndex Value="7"/>
<TopLine Value="21"/> <TopLine Value="21"/>
<CursorPos X="24" Y="53"/> <CursorPos X="24" Y="53"/>
<UsageCount Value="21"/> <UsageCount Value="21"/>
@@ -579,123 +580,123 @@
<JumpHistory Count="30" HistoryIndex="29"> <JumpHistory Count="30" HistoryIndex="29">
<Position1> <Position1>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="1106" Column="15" TopLine="1081"/>
<Caret Line="1106" Column="20" TopLine="1081"/>
</Position1> </Position1>
<Position2> <Position2>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="27" Column="25" TopLine="5"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="61" Column="14" TopLine="52"/>
</Position2> </Position2>
<Position3> <Position3>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="76" Column="9" TopLine="62"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="331" Column="19" TopLine="320"/>
</Position3> </Position3>
<Position4> <Position4>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="77" Column="8" TopLine="59"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="332" Column="49" TopLine="320"/>
</Position4> </Position4>
<Position5> <Position5>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="86" Column="17" TopLine="59"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="336" Column="21" TopLine="320"/>
</Position5> </Position5>
<Position6> <Position6>
<Filename Value="..\utils\uvkuQueue.pas"/> <Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="75" Column="47" TopLine="59"/>
<Caret Line="27" Column="15" TopLine="11"/>
</Position6> </Position6>
<Position7> <Position7>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="1106" Column="20" TopLine="1081"/>
<Caret Line="602" Column="19" TopLine="585"/>
</Position7> </Position7>
<Position8> <Position8>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="61" Column="14" TopLine="52"/>
<Caret Line="642" Column="19" TopLine="622"/>
</Position8> </Position8>
<Position9> <Position9>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="331" Column="19" TopLine="320"/>
<Caret Line="1057" Column="41" TopLine="1048"/>
</Position9> </Position9>
<Position10> <Position10>
<Filename Value="uMainForm.pas"/>
<Caret Line="332" Column="49" TopLine="320"/>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="9" Column="30" TopLine="2"/>
</Position10> </Position10>
<Position11> <Position11>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="336" Column="21" TopLine="320"/>
<Caret Line="1124" Column="64" TopLine="1096"/>
</Position11> </Position11>
<Position12> <Position12>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="27" Column="15" TopLine="11"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="1127" Column="24" TopLine="1102"/>
</Position12> </Position12>
<Position13> <Position13>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="602" Column="19" TopLine="585"/>
<Caret Line="1151" Column="18" TopLine="1125"/>
</Position13> </Position13>
<Position14> <Position14>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="642" Column="19" TopLine="622"/>
<Caret Line="1147" Column="37" TopLine="1126"/>
</Position14> </Position14>
<Position15> <Position15>
<Filename Value="uMainForm.pas"/>
<Caret Line="1057" Column="41" TopLine="1048"/>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="57" TopLine="41"/>
</Position15> </Position15>
<Position16> <Position16>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="9" Column="30" TopLine="2"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="1109" Column="26" TopLine="1097"/>
</Position16> </Position16>
<Position17> <Position17>
<Filename Value="uMainForm.pas"/>
<Caret Line="1124" Column="64" TopLine="1096"/>
<Filename Value="..\utils\uvkuInstance.pas"/>
<Caret Line="86" Column="3" TopLine="80"/>
</Position17> </Position17>
<Position18> <Position18>
<Filename Value="uMainForm.pas"/>
<Caret Line="1127" Column="24" TopLine="1102"/>
<Filename Value="..\utils\uvkuInstance.pas"/>
<Caret Line="55" Column="23" TopLine="39"/>
</Position18> </Position18>
<Position19> <Position19>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="1151" Column="18" TopLine="1125"/>
<Caret Line="1109" Column="26" TopLine="1097"/>
</Position19> </Position19>
<Position20> <Position20>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="1147" Column="37" TopLine="1126"/>
<Caret Line="341" Column="32" TopLine="327"/>
</Position20> </Position20>
<Position21> <Position21>
<Filename Value="..\utils\uvkuQueue.pas"/>
<Caret Line="57" TopLine="41"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="344" Column="62" TopLine="327"/>
</Position21> </Position21>
<Position22> <Position22>
<Filename Value="uMainForm.pas"/> <Filename Value="uMainForm.pas"/>
<Caret Line="1109" Column="26" TopLine="1097"/>
<Caret Line="477" Column="30" TopLine="451"/>
</Position22> </Position22>
<Position23> <Position23>
<Filename Value="..\utils\uvkuInstance.pas"/>
<Caret Line="86" Column="3" TopLine="80"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="482" Column="60" TopLine="456"/>
</Position23> </Position23>
<Position24> <Position24>
<Filename Value="..\utils\uvkuInstance.pas"/>
<Caret Line="55" Column="23" TopLine="39"/>
<Filename Value="uMainForm.pas"/>
<Caret Line="1056" Column="39" TopLine="1039"/>
</Position24> </Position24>
<Position25> <Position25>
<Filename Value="uMainForm.pas"/>
<Caret Line="1109" Column="26" TopLine="1097"/>
<Filename Value="triangle.lpr"/>
<Caret Line="11" Column="20"/>
</Position25> </Position25>
<Position26> <Position26>
<Filename Value="uMainForm.pas"/>
<Caret Line="341" Column="32" TopLine="327"/>
<Filename Value="..\Vulkan.pas"/>
<Caret Line="4828" TopLine="4816"/>
</Position26> </Position26>
<Position27> <Position27>
<Filename Value="uMainForm.pas"/>
<Caret Line="344" Column="62" TopLine="327"/>
<Filename Value="..\Vulkan.pas"/>
<Caret Line="4829" TopLine="4816"/>
</Position27> </Position27>
<Position28> <Position28>
<Filename Value="uMainForm.pas"/>
<Caret Line="477" Column="30" TopLine="451"/>
<Filename Value="..\Vulkan.pas"/>
<Caret Line="4830" Column="8" TopLine="4816"/>
</Position28> </Position28>
<Position29> <Position29>
<Filename Value="uMainForm.pas"/>
<Caret Line="482" Column="60" TopLine="456"/>
<Filename Value="..\Vulkan.pas"/>
<Caret Line="4840" TopLine="4816"/>
</Position29> </Position29>
<Position30> <Position30>
<Filename Value="uMainForm.pas"/>
<Caret Line="1056" Column="39" TopLine="1039"/>
<Filename Value="triangle.lpr"/>
<Caret Line="24"/>
</Position30> </Position30>
</JumpHistory> </JumpHistory>
</ProjectSession> </ProjectSession>


+ 1
- 1
projects/triangle/uMainForm.pas Ver fichero

@@ -1095,7 +1095,7 @@ begin
// present queue // present queue
AllocCallbacks := fAllocHandler.GetStructure; AllocCallbacks := fAllocHandler.GetStructure;
Semaphore := TvkuSemaphore.Create( Semaphore := TvkuSemaphore.Create(
VkSemaphoreCreateFlags([ VK_FENCE_CREATE_SIGNALED_BIT ]),
VkSemaphoreCreateFlags([ ]),
fDevice.DeviceCommands, fDevice.DeviceCommands,
@AllocCallbacks); @AllocCallbacks);
try try


Escribir Vista previa
Cargando…
Cancelar
Guardar