Added SDL_PROP_GPU_TEXTURE_CREATE_PIXELBUFFER_POINTER

Author: slouken

include/SDL3/SDL_gpu.h

@@ -2713,6 +2713,11 @@ extern SDL_DECLSPEC SDL_GPUShader * SDLCALL SDL_CreateGPUShader(
  * There are optional properties that can be provided through
  * SDL_GPUTextureCreateInfo's `props`. These are the supported properties:
  *
+ * - `SDL_PROP_GPU_TEXTURE_CREATE_NAME_STRING`: a name that can be displayed
+ *   in debugging tools.
+ *
+ * With the direct3d12 driver:
+ *
  * - `SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_R_FLOAT`: (Direct3D 12 only) if
  *   the texture usage is SDL_GPU_TEXTUREUSAGE_COLOR_TARGET, clear the texture
  *   to a color with this red intensity. Defaults to zero.
@@ -2731,10 +2736,14 @@ extern SDL_DECLSPEC SDL_GPUShader * SDLCALL SDL_CreateGPUShader(
  * - `SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_STENCIL_NUMBER`: (Direct3D 12
  *   only) if the texture usage is SDL_GPU_TEXTUREUSAGE_DEPTH_STENCIL_TARGET,
  *   clear the texture to a stencil of this Uint8 value. Defaults to zero.
- * - `SDL_PROP_GPU_TEXTURE_CREATE_NAME_STRING`: a name that can be displayed
- *   in debugging tools.
  * - `SDL_PROP_GPU_TEXTURE_CREATE_DXGI_SHARED_HANDLE_POINTER`: a DXGI shared handle associated with the texture, if you want to wrap an existing texture. The texture must have been created with D3D11_RESOURCE_MISC_SHARED_KEYEDMUTEX.
  *
+ * With the metal driver:
+ *
+ * - `SDL_PROP_GPU_TEXTURE_CREATE_PIXELBUFFER_POINTER`: the CVPixelBufferRef
+ *   associated with the texture, if you want to create a texture from an
+ *   existing pixel buffer.
+ *
  * \param device a GPU Context.
  * \param createinfo a struct describing the state of the texture to create.
  * \returns a texture object on success, or NULL on failure; call
@@ -2759,14 +2768,15 @@ extern SDL_DECLSPEC SDL_GPUTexture * SDLCALL SDL_CreateGPUTexture(
     SDL_GPUDevice *device,
     const SDL_GPUTextureCreateInfo *createinfo);
 
+#define SDL_PROP_GPU_TEXTURE_CREATE_NAME_STRING                     "SDL.gpu.texture.create.name"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_R_FLOAT             "SDL.gpu.texture.create.d3d12.clear.r"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_G_FLOAT             "SDL.gpu.texture.create.d3d12.clear.g"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_B_FLOAT             "SDL.gpu.texture.create.d3d12.clear.b"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_A_FLOAT             "SDL.gpu.texture.create.d3d12.clear.a"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_DEPTH_FLOAT         "SDL.gpu.texture.create.d3d12.clear.depth"
 #define SDL_PROP_GPU_TEXTURE_CREATE_D3D12_CLEAR_STENCIL_NUMBER      "SDL.gpu.texture.create.d3d12.clear.stencil"
-#define SDL_PROP_GPU_TEXTURE_CREATE_NAME_STRING                     "SDL.gpu.texture.create.name"
 #define SDL_PROP_GPU_TEXTURE_CREATE_DXGI_SHARED_HANDLE_POINTER      "SDL.gpu.texture.create.dxgi_handle"
+#define SDL_PROP_GPU_TEXTURE_CREATE_PIXELBUFFER_POINTER             "SDL.gpu.texture.create.pixelbuffer"
 
 /**
  * Creates a buffer object to be used in graphics or compute workflows.

src/gpu/metal/SDL_gpu_metal.m

@@ -25,6 +25,7 @@
 
 #include <Metal/Metal.h>
 #include <QuartzCore/CoreAnimation.h>
+#include <CoreVideo/CoreVideo.h>
 
 #include "../SDL_sysgpu.h"
 
@@ -1428,6 +1429,49 @@ static void METAL_PopDebugGroup(
     MTLTextureDescriptor *textureDescriptor = [MTLTextureDescriptor new];
     id<MTLTexture> texture;
     MetalTexture *metalTexture;
+    CVPixelBufferRef pixelbuffer = nil;
+    IOSurfaceRef surface = nil;
+    NSUInteger plane = 0;
+
+    pixelbuffer = SDL_GetPointerProperty(createinfo->props, SDL_PROP_GPU_TEXTURE_CREATE_PIXELBUFFER_POINTER, nil);
+    if (pixelbuffer) {
+        surface = CVPixelBufferGetIOSurface(pixelbuffer);
+        if (!surface) {
+            SET_STRING_ERROR_AND_RETURN("CVPixelBufferGetIOSurface() failed", NULL);
+        }
+
+        OSType format = CVPixelBufferGetPixelFormatType(pixelbuffer);
+        switch (format) {
+        case kCVPixelFormatType_420YpCbCr8BiPlanarVideoRange:
+        case kCVPixelFormatType_420YpCbCr8BiPlanarFullRange:
+            switch (createinfo->format) {
+            case SDL_GPU_TEXTUREFORMAT_R8_UNORM:
+                plane = 0;
+                break;
+            case SDL_GPU_TEXTUREFORMAT_R8G8_UNORM:
+                plane = 1;
+                break;
+            default:
+                break;
+            }
+            break;
+        case kCVPixelFormatType_420YpCbCr10BiPlanarVideoRange:
+        case kCVPixelFormatType_420YpCbCr10BiPlanarFullRange:
+            switch (createinfo->format) {
+            case SDL_GPU_TEXTUREFORMAT_R16_UNORM:
+                plane = 0;
+                break;
+            case SDL_GPU_TEXTUREFORMAT_R16G16_UNORM:
+                plane = 1;
+                break;
+            default:
+                break;
+            }
+            break;
+        default:
+            break;
+        }
+    }
 
     textureDescriptor.textureType = SDLToMetal_TextureType(createinfo->type, createinfo->sample_count > SDL_GPU_SAMPLECOUNT_1);
     textureDescriptor.pixelFormat = SDLToMetal_TextureFormat(createinfo->format);
@@ -1469,7 +1513,11 @@ static void METAL_PopDebugGroup(
         textureDescriptor.usage |= MTLTextureUsageShaderWrite;
     }
 
-    texture = [renderer->device newTextureWithDescriptor:textureDescriptor];
+    if (surface) {
+        texture = [renderer->device newTextureWithDescriptor:textureDescriptor iosurface:surface plane:plane];
+    } else {
+        texture = [renderer->device newTextureWithDescriptor:textureDescriptor];
+    }
     if (texture == NULL) {
         SDL_LogError(SDL_LOG_CATEGORY_GPU, "Failed to create MTLTexture!");
         return NULL;

test/testffmpeg.c

@@ -1105,7 +1105,11 @@ static bool GetTextureForVideoToolboxFrame(AVFrame *frame, SDL_Texture **texture
     }
 
     props = CreateVideoTextureProperties(frame, SDL_PIXELFORMAT_UNKNOWN, SDL_TEXTUREACCESS_STATIC);
-    SDL_SetPointerProperty(props, SDL_PROP_TEXTURE_CREATE_METAL_PIXELBUFFER_POINTER, pPixelBuffer);
+    if (have_gpu_renderer) {
+        SDL_SetPointerProperty(props, SDL_PROP_GPU_TEXTURE_CREATE_PIXELBUFFER_POINTER, pPixelBuffer);
+    } else {
+        SDL_SetPointerProperty(props, SDL_PROP_TEXTURE_CREATE_METAL_PIXELBUFFER_POINTER, pPixelBuffer);
+    }
     *texture = SDL_CreateTextureWithProperties(renderer, props);
     SDL_DestroyProperties(props);
     if (!*texture) {