a_dinosaur/NeHe-SDL_GPU
1
0
Fork 0
mirror of https://github.com/ScrelliCopter/NeHe-SDL_GPU.git synced 2025-06-19 21:49:17 +10:00
Code Issues Packages Projects Releases Wiki Activity

swift: Simplify surface pixel size calculation

Browse Source
This commit is contained in:
a dinosaur
2025-06-12 15:53:05 +10:00
parent 0dd8ed021f
commit 69eef16b6a
1 changed files with 3 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/swift/NeHe/NeHeCopyPass.swift
View File

@@ -174,19 +174,6 @@ public extension NeHeCopyPass
default: (true, SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM) default: (true, SDL_GPU_TEXTUREFORMAT_R8G8B8A8_UNORM)
} }
func BYTESPERPIXEL(_ format: SDL_PixelFormat) -> UInt32
{
let isFourCC = format.rawValue != 0 && (((format.rawValue >> 28) & 0xF) != 1)
return isFourCC
? [
SDL_PIXELFORMAT_YUY2,
SDL_PIXELFORMAT_UYVY,
SDL_PIXELFORMAT_YVYU,
SDL_PIXELFORMAT_P010
].contains(format) ? 2 : 1
: format.rawValue & 0xFF
}
let data: UnsafeRawBufferPointer let data: UnsafeRawBufferPointer
let conv: UnsafeMutablePointer<SDL_Surface>? = nil let conv: UnsafeMutablePointer<SDL_Surface>? = nil
if needsConvert if needsConvert
@@ -196,15 +183,13 @@ public extension NeHeCopyPass
{ {
throw .sdlError("SDL_ConvertSurface", String(cString: SDL_GetError())) throw .sdlError("SDL_ConvertSurface", String(cString: SDL_GetError()))
} }
let numPixels = Int(conv.pointee.w) * Int(conv.pointee.h) data = .init(start: conv.pointee.pixels, count: Int(conv.pointee.pitch) * Int(conv.pointee.h))
data = .init(start: conv.pointee.pixels, count: Int(BYTESPERPIXEL(conv.pointee.format)) * numPixels)
} }
else else
{ {
let numPixels = Int(surface.pointee.w) * Int(surface.pointee.h) data = .init(start: surface.pointee.pixels, count: Int(surface.pointee.pitch) * Int(surface.pointee.h))
data = .init(start: surface.pointee.pixels, count: Int(BYTESPERPIXEL(surface.pointee.format)) * numPixels)
} }
defer { SDL_DestroySurface(conv) } defer { if needsConvert { SDL_DestroySurface(conv) } }
if genMipmaps if genMipmaps
{ {