AxioDL/metaforce
2
0
Fork 0
mirror of https://github.com/AxioDL/metaforce.git synced 2025-12-08 22:27:43 +00:00
Code Issues Projects Releases Wiki Activity

Deadlock fixes and PC TXTR loading

Browse Source
This commit is contained in:
Jack Andersen
2016-03-31 11:06:41 -10:00
parent 208049856b
commit bc6ba1141d
11 changed files with 80 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
Runtime/Graphics/CTextureBoo.cpp
View File

@@ -5,6 +5,7 @@
namespace urde
{
static logvisor::Module Log("urde::CTextureBoo");
/* GX uses this upsampling technique to prevent banding on downsampled texture formats */
static inline uint8_t Convert3To8(uint8_t v)
@@ -647,6 +648,19 @@ void CTexture::BuildDXT1FromGCN(CInputStream& in)
});
}
void CTexture::BuildRGBA8(CInputStream& in)
{
size_t texelCount = ComputeMippedTexelCount();
std::unique_ptr<atInt8[]> buf = in.readBytes(texelCount * 4);
m_booToken = CGraphics::CommitResources([&](boo::IGraphicsDataFactory::Context& ctx) -> bool
{
m_booTex = ctx.newStaticTexture(x4_w, x6_h, x8_mips, boo::TextureFormat::RGBA8,
buf.get(), texelCount * 4);
return true;
});
}
CTexture::CTexture(CInputStream& in)
{
x0_fmt = ETexelFormat(in.readUint32Big());
@@ -689,6 +703,11 @@ CTexture::CTexture(CInputStream& in)
case ETexelFormat::CMPR:
BuildDXT1FromGCN(in);
break;
case ETexelFormat::RGBA8PC:
BuildRGBA8(in);
break;
default:
Log.report(logvisor::Fatal, "invalid texture type %d for boo", int(x0_fmt));
}
}