createRGBSurface(From)? use PixelFormat instead of hardcoded values (#94)

Author: afwlehmann

src/SDL/Video/Renderer.hs

@@ -306,31 +306,31 @@ queryTexture (Texture tex) = liftIO $
 -- | Allocate a new RGB surface.
 --
 -- See @<https://wiki.libsdl.org/SDL_CreateRGBSurface SDL_CreateRGBSurface>@ for C documentation.
-createRGBSurface :: (Functor m,MonadIO m)
+createRGBSurface :: (Functor m, MonadIO m)
                  => V2 CInt -- ^ The size of the surface
-                 -> CInt -- ^ The bit-depth of the surface
-                 -> V4 Word32 -- ^ The red, green, blue and alpha mask for the pixels
+                 -> PixelFormat -- ^ The bit depth, red, green, blue and alpha mask for the pixels
                  -> m Surface
-createRGBSurface (V2 w h) d (V4 r g b a) =
+createRGBSurface (V2 w h) pf =
   fmap unmanagedSurface $
-  throwIfNull "SDL.Video.createRGBSurface" "SDL_CreateRGBSurface" $
-  Raw.createRGBSurface 0 w h d r g b a
+    throwIfNull "SDL.Video.createRGBSurface" "SDL_CreateRGBSurface" $ do
+      (bpp, V4 r g b a) <- pixelFormatToMasks pf
+      Raw.createRGBSurface 0 w h bpp r g b a
 
 -- | Allocate a new RGB surface with existing pixel data.
 --
 -- See @<https://wiki.libsdl.org/SDL_CreateRGBSurfaceFrom SDL_CreateRGBSurfaceFrom>@ for C documentation.
-createRGBSurfaceFrom :: (Functor m,MonadIO m)
+createRGBSurfaceFrom :: (Functor m, MonadIO m)
                      => MSV.IOVector Word8 -- ^ The existing pixel data
                      -> V2 CInt -- ^ The size of the surface
-                     -> CInt -- ^ The bit-depth of the surface
                      -> CInt -- ^ The pitch - the length of a row of pixels in bytes
-                     -> V4 Word32 -- ^ The red, green blue and alpha mask for the pixels
+                     -> PixelFormat -- ^ The bit depth, red, green, blue and alpha mask for the pixels
                      -> m Surface
-createRGBSurfaceFrom pixels (V2 w h) d p (V4 r g b a) = liftIO $
+createRGBSurfaceFrom pixels (V2 w h) p pf = liftIO $
   fmap (managedSurface pixels) $
-  throwIfNull "SDL.Video.createRGBSurfaceFrom" "SDL_CreateRGBSurfaceFrom" $
-    MSV.unsafeWith pixels $ \pixelPtr ->
-      Raw.createRGBSurfaceFrom (castPtr pixelPtr) w h d p r g b a
+    throwIfNull "SDL.Video.createRGBSurfaceFrom" "SDL_CreateRGBSurfaceFrom" $ do
+      (bpp, V4 r g b a) <- pixelFormatToMasks pf
+      MSV.unsafeWith pixels $ \pixelPtr ->
+        Raw.createRGBSurfaceFrom (castPtr pixelPtr) w h bpp p r g b a
 
 -- | Perform a fast fill of a rectangle with a specific color.
 --