mirror
/
SDL
mirror of https://github.com/libsdl-org/SDL.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed building the metal renderer with SDL_LEAN_AND_MEAN 

Fixes https://github.com/libsdl-org/SDL/issues/10038
This commit is contained in:
Sam Lantinga 2024-06-16 22:04:57 -07:00
parent aeea819494
commit b6e6c73541
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/render/metal/SDL_render_metal.m
View File

@ -628,8 +628,6 @@ static int METAL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL
MTLPixelFormat pixfmt; MTLPixelFormat pixfmt;
MTLTextureDescriptor *mtltexdesc; MTLTextureDescriptor *mtltexdesc;
id<MTLTexture> mtltexture = nil, mtltextureUv = nil; id<MTLTexture> mtltexture = nil, mtltextureUv = nil;
BOOL yuv = FALSE;
BOOL nv12 = FALSE;
METAL_TextureData *texturedata; METAL_TextureData *texturedata;
CVPixelBufferRef pixelbuffer = nil; CVPixelBufferRef pixelbuffer = nil;
IOSurfaceRef surface = nil; IOSurfaceRef surface = nil;
@ -708,8 +706,8 @@ static int METAL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL
mtltextureUv = nil; mtltextureUv = nil;
#if SDL_HAVE_YUV #if SDL_HAVE_YUV
yuv = (texture->format == SDL_PIXELFORMAT_IYUV || texture->format == SDL_PIXELFORMAT_YV12); BOOL yuv = (texture->format == SDL_PIXELFORMAT_IYUV || texture->format == SDL_PIXELFORMAT_YV12);
nv12 = (texture->format == SDL_PIXELFORMAT_NV12 || texture->format == SDL_PIXELFORMAT_NV21 || texture->format == SDL_PIXELFORMAT_P010); BOOL nv12 = (texture->format == SDL_PIXELFORMAT_NV12 || texture->format == SDL_PIXELFORMAT_NV21 || texture->format == SDL_PIXELFORMAT_P010);
if (yuv) { if (yuv) {
mtltexdesc.pixelFormat = MTLPixelFormatR8Unorm; mtltexdesc.pixelFormat = MTLPixelFormatR8Unorm;
@ -748,16 +746,18 @@ static int METAL_CreateTexture(SDL_Renderer *renderer, SDL_Texture *texture, SDL
} }
if (SDL_COLORSPACETRANSFER(texture->colorspace) == SDL_TRANSFER_CHARACTERISTICS_SRGB) { if (SDL_COLORSPACETRANSFER(texture->colorspace) == SDL_TRANSFER_CHARACTERISTICS_SRGB) {
texturedata.fragmentFunction = SDL_METAL_FRAGMENT_COPY; texturedata.fragmentFunction = SDL_METAL_FRAGMENT_COPY;
#if SDL_HAVE_YUV
} else if (yuv) { } else if (yuv) {
texturedata.fragmentFunction = SDL_METAL_FRAGMENT_YUV; texturedata.fragmentFunction = SDL_METAL_FRAGMENT_YUV;
#endif
} else { } else {
texturedata.fragmentFunction = SDL_METAL_FRAGMENT_ADVANCED; texturedata.fragmentFunction = SDL_METAL_FRAGMENT_ADVANCED;
} }
texturedata.mtltexture = mtltexture; texturedata.mtltexture = mtltexture;
texturedata.mtltextureUv = mtltextureUv; texturedata.mtltextureUv = mtltextureUv;
#if SDL_HAVE_YUV
texturedata.yuv = yuv; texturedata.yuv = yuv;
texturedata.nv12 = nv12; texturedata.nv12 = nv12;
#if SDL_HAVE_YUV
if (yuv || nv12) { if (yuv || nv12) {
size_t offset = GetYCbCRtoRGBConversionMatrix(texture->colorspace, texture->w, texture->h, 8); size_t offset = GetYCbCRtoRGBConversionMatrix(texture->colorspace, texture->w, texture->h, 8);
if (offset == 0) { if (offset == 0) {
@ -1013,7 +1013,9 @@ static void METAL_UnlockTexture(SDL_Renderer *renderer, SDL_Texture *texture)
id<MTLBlitCommandEncoder> blitcmd; id<MTLBlitCommandEncoder> blitcmd;
SDL_Rect rect = texturedata.lockedrect; SDL_Rect rect = texturedata.lockedrect;
int pitch = SDL_BYTESPERPIXEL(texture->format) * rect.w; int pitch = SDL_BYTESPERPIXEL(texture->format) * rect.w;
#if SDL_HAVE_YUV
SDL_Rect UVrect = { rect.x / 2, rect.y / 2, (rect.w + 1) / 2, (rect.h + 1) / 2 }; SDL_Rect UVrect = { rect.x / 2, rect.y / 2, (rect.w + 1) / 2, (rect.h + 1) / 2 };
#endif
if (texturedata.lockedbuffer == nil) { if (texturedata.lockedbuffer == nil) {
return; return;