godotengine
/
godot
mirror of https://github.com/godotengine/godot
1
0
Fork 0
Code

Merge pull request #99905 from stuartcarnie/fix_external_texture 

Metal: Ensure `texture_create_from_extension` returns correct pixel format
This commit is contained in:
Thaddeus Crews 2024-12-03 14:40:55 -06:00
parent cebd37da8b 7caa039183
commit 70dae45dd0
No known key found for this signature in database
GPG Key ID: 62181B86FE9E5D84
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
drivers/metal/rendering_device_driver_metal.mm
View File

@ -358,11 +358,25 @@ RDD::TextureID RenderingDeviceDriverMetal::texture_create(const TextureFormat &p
}
RDD::TextureID RenderingDeviceDriverMetal::texture_create_from_extension(uint64_t p_native_texture, TextureType p_type, DataFormat p_format, uint32_t p_array_layers, bool p_depth_stencil) {
id<MTLTexture> obj = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;
id<MTLTexture> res = (__bridge id<MTLTexture>)(void *)(uintptr_t)p_native_texture;
// We only need to create a RDD::TextureID for an existing, natively-provided texture.
// If the requested format is different, we need to create a view.
MTLPixelFormat format = pixel_formats->getMTLPixelFormat(p_format);
if (res.pixelFormat != format) {
MTLTextureSwizzleChannels swizzle = MTLTextureSwizzleChannelsMake(
MTLTextureSwizzleRed,
MTLTextureSwizzleGreen,
MTLTextureSwizzleBlue,
MTLTextureSwizzleAlpha);
res = [res newTextureViewWithPixelFormat:format
textureType:res.textureType
levels:NSMakeRange(0, res.mipmapLevelCount)
slices:NSMakeRange(0, p_array_layers)
swizzle:swizzle];
ERR_FAIL_NULL_V_MSG(res, TextureID(), "Unable to create texture view.");
}
return rid::make(obj);
return rid::make(res);
}
RDD::TextureID RenderingDeviceDriverMetal::texture_create_shared(TextureID p_original_texture, const TextureView &p_view) {