Add support for unpackaged resources to speed up loads on Android, i.e. so we don't have to decompress entire GPAs to load a single resource.

This commit is contained in:
elasota
2020-10-12 18:03:23 -04:00
parent ec56bdace2
commit 1ecef6f8ef
26 changed files with 674 additions and 252 deletions

View File

@@ -1,6 +1,7 @@
#pragma once
#include "VirtualDirectory.h"
#include "PascalStr.h"
#include "PLErrorCodes.h"
#include "PLHandle.h"
@@ -25,21 +26,78 @@ namespace PortabilityLayer
int16_t m_resID;
};
class ResourceArchive final
struct IResourceArchive
{
virtual void Destroy() = 0;
virtual THandle<void> LoadResource(const ResTypeID &resTypeID, int id) = 0;
virtual bool HasAnyResourcesOfType(const ResTypeID &resTypeID) const = 0;
virtual bool FindFirstResourceOfType(const ResTypeID &resTypeID, int16_t &outID) const = 0;
};
class ResourceArchiveBase : public IResourceArchive
{
public:
static ResourceArchive *Create(ZipFileProxy *zipFileProxy, GpIOStream *stream);
void Destroy();
static const char *GetFileExtensionForResType(const ResTypeID &resTypeID, int &outValidationRule);
};
THandle<void> LoadResource(const ResTypeID &resTypeID, int id);
bool GetResourceSize(const ResTypeID &resTypeID, int id, size_t &outSize) const;
class ResourceArchiveDirectory final : public ResourceArchiveBase
{
public:
static ResourceArchiveDirectory *Create(VirtualDirectory_t directory, const PLPasStr &subdirectory);
void Destroy() override;
bool HasAnyResourcesOfType(const ResTypeID &resTypeID) const;
bool FindFirstResourceOfType(const ResTypeID &resTypeID, int16_t &outID) const;
THandle<void> LoadResource(const ResTypeID &resTypeID, int id) override;
bool HasAnyResourcesOfType(const ResTypeID &resTypeID) const override;
bool FindFirstResourceOfType(const ResTypeID &resTypeID, int16_t &outID) const override;
bool Init();
private:
ResourceArchive(ZipFileProxy *zipFileProxy, GpIOStream *stream, ResourceArchiveRef *resourceHandles);
~ResourceArchive();
ResourceArchiveDirectory(VirtualDirectory_t directory, const PLPasStr &subdirectory);
~ResourceArchiveDirectory();
struct ResTypeEntry
{
int32_t m_resTypeID;
size_t m_firstRes;
size_t m_lastRes;
};
bool IndexResource(const ResTypeID &resTypeID, int id, size_t &outIndex) const;
THandle<void> GetResource(const ResTypeID &resTypeID, int id, bool load);
static int ResTypeSearchPredicate(int32_t resTypeID, const ResTypeEntry &entry);
static int ResIDSearchPredicate(int16_t resTypeID, int16_t entry);
static bool ResTypeEntrySortPredicate(const ResTypeEntry &a, const ResTypeEntry &b);
VirtualDirectory_t m_directory;
char m_subdirectory[256];
THandle<ResTypeEntry> m_resTypes;
size_t m_numResourceTypes;
THandle<int16_t> m_resIDs;
ResourceArchiveRef *m_resourceHandles;
size_t m_numResources;
};
class ResourceArchiveZipFile final : public ResourceArchiveBase
{
public:
static ResourceArchiveZipFile *Create(ZipFileProxy *zipFileProxy, GpIOStream *stream);
void Destroy() override;
THandle<void> LoadResource(const ResTypeID &resTypeID, int id) override;
bool HasAnyResourcesOfType(const ResTypeID &resTypeID) const override;
bool FindFirstResourceOfType(const ResTypeID &resTypeID, int16_t &outID) const override;
private:
ResourceArchiveZipFile(ZipFileProxy *zipFileProxy, GpIOStream *stream, ResourceArchiveRef *resourceHandles);
~ResourceArchiveZipFile();
bool IndexResource(const ResTypeID &resTypeID, int id, size_t &outIndex, int &outValidationRule) const;
@@ -57,9 +115,9 @@ namespace PortabilityLayer
virtual void Shutdown() = 0;
virtual THandle<void> GetAppResource(const ResTypeID &resTypeID, int16_t resID) const = 0;
virtual ResourceArchive *GetAppResourceArchive() const = 0;
virtual IResourceArchive *GetAppResourceArchive() const = 0;
virtual ResourceArchive *LoadResFile(VirtualDirectory_t virtualDir, const PLPasStr &filename) const = 0;
virtual IResourceArchive *LoadResFile(VirtualDirectory_t virtualDir, const PLPasStr &filename) const = 0;
virtual PLError_t CreateBlankResFile(VirtualDirectory_t virtualDir, const PLPasStr &filename) = 0;
virtual void DissociateHandle(MMHandleBlock *hdl) const = 0;