AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-26 13:30:07 +00:00
Code Issues Releases Wiki Activity

Fixed mtlPtexMipmapTexture 3-component textures

Browse Source 
Fixed the example mtlPtexMipmapTexture loader to support
the padAlpha option used when loading 3-component textures.
This commit is contained in:
David G Yu 2019-06-18 15:30:43 -07:00
parent 7794010e8f
commit b4ace6791b
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
examples/common/mtlPtexMipmapTexture.mm
View File

@ -46,7 +46,17 @@ const char* MTLPtexMipmapTexture::GetShaderSource() {
MTLPtexMipmapTexture * MTLPtexMipmapTexture::Create(Osd::MTLContext *deviceContext, PtexTexture *reader, int maxLevels) {
const auto maxNumPages = 2048;
PtexMipmapTextureLoader loader(reader, maxNumPages, maxLevels);
size_t targetMemory = 0;
// Read the ptex data and pack the texels
bool padAlpha = reader->numChannels()==3;
PtexMipmapTextureLoader loader(reader,
maxNumPages,
maxLevels,
targetMemory,
true/*seemlessMipmap*/,
padAlpha);
const auto numFaces = loader.GetNumFaces();
const auto layoutBuffer = [deviceContext->device newBufferWithBytes:loader.GetLayoutBuffer() length:numFaces * 6 * sizeof(short) options:Osd::MTLDefaultStorageMode];
@ -54,7 +64,7 @@ MTLPtexMipmapTexture * MTLPtexMipmapTexture::Create(Osd::MTLContext *deviceConte
const auto textureDescriptor = [MTLTextureDescriptor new];
int bpp = 0;
textureDescriptor.pixelFormat = [&]() {
const auto numChannels = reader->numChannels();
const auto numChannels = reader->numChannels() + padAlpha;
switch(reader->dataType()) {
case Ptex::dt_uint16:
bpp = sizeof(short) * numChannels;