diff --git a/chip/pm4_me.pas b/chip/pm4_me.pas index 086b9430..1d13f2be 100644 --- a/chip/pm4_me.pas +++ b/chip/pm4_me.pas @@ -12,6 +12,7 @@ uses si_ci_vi_merged_enum, + sys_bootparam, md_sleep, Vulkan, @@ -547,7 +548,10 @@ begin r:=Cmd.QueueSubmit; - Writeln('QueueSubmit:',r); + if p_print_gpu_ops then + begin + Writeln('QueueSubmit:',r); + end; if (r<>VK_SUCCESS) then begin @@ -2507,7 +2511,10 @@ begin if not ctx.stream^.hint_cmds then begin - Writeln('+',ctx.node^.ntype); + if p_print_gpu_ops then + begin + Writeln('+',ctx.node^.ntype); + end; ctx.stream^.hint_cmds:=True; end; diff --git a/spirv/srBuffer.pas b/spirv/srBuffer.pas index b7b5faf2..432ccadb 100644 --- a/spirv/srBuffer.pas +++ b/spirv/srBuffer.pas @@ -1329,7 +1329,7 @@ begin node:=First; While (node<>nil) do begin - if node.is_export_used then + if node.IsUsed then //Dont use is_export_used in this stage if not node.pLayout.IsLocalDataShare then if not node.pLayout.IsGlobalDataShare then begin diff --git a/vulkan/vImageTiling.pas b/vulkan/vImageTiling.pas index df6e3240..5d109564 100644 --- a/vulkan/vImageTiling.pas +++ b/vulkan/vImageTiling.pas @@ -6,6 +6,7 @@ interface uses SysUtils, + sys_bootparam, ps4_tiling, Vulkan, vDevice, @@ -1034,7 +1035,10 @@ begin if not change_rate.need_read then Exit; - Writeln('loadfrom: ',image.FName); + if p_print_gpu_ops then + begin + Writeln('loadfrom: ',image.FName); + end; cb:=a_tiling_cbs[Byte(image.key.params.tiling)].load_from; @@ -1074,7 +1078,10 @@ begin Exit; end; + if p_print_gpu_ops then + begin Writeln('writeback:',image.FName); + end; cb:=a_tiling_cbs[Byte(image.key.params.tiling)].write_back; diff --git a/vulkan/vShaderExt.pas b/vulkan/vShaderExt.pas index e7e76eb0..25684037 100644 --- a/vulkan/vShaderExt.pas +++ b/vulkan/vShaderExt.pas @@ -1209,8 +1209,8 @@ begin //print_vsharp(PV); b:=Default(TBufBindExt); - b.fset:=fset; - b.bind:=bind; + b.fset :=fset; + b.bind :=bind; b.offset:=offset; b.memuse:=_get_buf_mem_usage(flags); @@ -1222,9 +1222,9 @@ begin if (stride=0) then stride:=1; if (num_records=0) then num_records:=1; // - b.size:=stride*num_records; + b.size:=(stride*num_records)+offset; //take into account the offset inside the shader // - if (b.size>size) then b.size:=size; + if (b.size>size) then b.size:=size; //input size already taking into account offset i:=Length(FBuffers); SetLength(FBuffers,i+1); @@ -1240,13 +1240,13 @@ begin if (P=nil) or (size=0) then Exit; b:=Default(TBufBindExt); - b.fset:=fset; - b.bind:=bind; + b.fset :=fset; + b.bind :=bind; b.offset:=offset; b.memuse:=_get_buf_mem_usage(flags); b.addr:=P; - b.size:=size; + b.size:=size; //input size already taking into account offset i:=Length(FBuffers); SetLength(FBuffers,i+1);