diff --git a/fpPS4.lpr b/fpPS4.lpr index b088637c..a6320706 100644 --- a/fpPS4.lpr +++ b/fpPS4.lpr @@ -56,6 +56,7 @@ uses ps4_videodrv, vMemory, vImageManager, + vImageTiling, vFlip, trace_manager; @@ -87,6 +88,7 @@ begin Writeln(' IMAGE_LOAD_HACK //Never reload textures (improves performance on many games)'); Writeln(' DISABLE_SRGB_HACK //Disables hacked SRGB display'); Writeln(' DISABLE_FMV_HACK //Disables in-game movies'); + Writeln(' SKIP_UNKNOW_TILING //Skip unknown tiling texture types'); Exit(False); end; @@ -134,6 +136,7 @@ begin 'IMAGE_LOAD_HACK' :vImageManager.IMAGE_LOAD_HACK:=True; 'DISABLE_SRGB_HACK' :vFlip.SRGB_HACK:=False; 'DISABLE_FMV_HACK' :ps4_libsceavplayer.DISABLE_FMV_HACK:=True; + 'SKIP_UNKNOW_TILING' :vImageTiling.SKIP_UNKNOW_TILING:=True; else; end; end; diff --git a/vulkan/vImageTiling.pas b/vulkan/vImageTiling.pas index 1f23836c..0b4f49b1 100644 --- a/vulkan/vImageTiling.pas +++ b/vulkan/vImageTiling.pas @@ -7,7 +7,6 @@ interface uses SysUtils, RWLock, - g23tree, ps4_shader, ps4_tiling, Vulkan, @@ -21,6 +20,9 @@ uses Procedure LoadFromBuffer(cmd:TvCustomCmdBuffer;image:TObject); //TvImage2 function CheckFromBuffer(image:TObject):Boolean; //TvImage2 +var + SKIP_UNKNOW_TILING:Boolean=False; + implementation uses @@ -495,6 +497,7 @@ begin _Load_Thin_1dThin(cmd,TvImage2(image)); else + if not SKIP_UNKNOW_TILING then Assert(false,'TODO tiling_idx:'+get_tiling_idx_str(TvImage2(image).key.params.tiling_idx)); end; @@ -631,7 +634,8 @@ begin Result:=_Check_Thin_1dThin(TvImage2(image)); else - Assert(false,'TODO'); + if not SKIP_UNKNOW_TILING then + Assert(false,'TODO tiling_idx:'+get_tiling_idx_str(TvImage2(image).key.params.tiling_idx)); end; end;