Skip to content

Commit 18e8c26

Browse files
jshipdpwiz
authored andcommitted
Remove redundant liftIO calls
1 parent 4dcb15a commit 18e8c26

File tree

1 file changed

+10
-14
lines changed

1 file changed

+10
-14
lines changed

src/SDL/Video/Renderer.hs

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -507,7 +507,7 @@ getWindowSurface (Window w) =
507507
rendererDrawBlendMode :: Renderer -> StateVar BlendMode
508508
rendererDrawBlendMode (Renderer r) = makeStateVar getRenderDrawBlendMode setRenderDrawBlendMode
509509
where
510-
getRenderDrawBlendMode = liftIO $
510+
getRenderDrawBlendMode =
511511
alloca $ \bmPtr -> do
512512
throwIfNeg_ "SDL.Video.Renderer.getRenderDrawBlendMode" "SDL_GetRenderDrawBlendMode" $
513513
Raw.getRenderDrawBlendMode r bmPtr
@@ -525,7 +525,7 @@ rendererDrawBlendMode (Renderer r) = makeStateVar getRenderDrawBlendMode setRend
525525
rendererDrawColor :: Renderer -> StateVar (V4 Word8)
526526
rendererDrawColor (Renderer re) = makeStateVar getRenderDrawColor setRenderDrawColor
527527
where
528-
getRenderDrawColor = liftIO $
528+
getRenderDrawColor =
529529
alloca $ \r ->
530530
alloca $ \g ->
531531
alloca $ \b ->
@@ -814,7 +814,7 @@ rendererScale (Renderer r) = makeStateVar renderGetScale renderSetScale
814814
throwIfNeg_ "SDL.Video.renderSetScale" "SDL_RenderSetScale" $
815815
Raw.renderSetScale r x y
816816

817-
renderGetScale = liftIO $
817+
renderGetScale =
818818
alloca $ \w ->
819819
alloca $ \h -> do
820820
Raw.renderGetScale r w h
@@ -828,12 +828,11 @@ rendererScale (Renderer r) = makeStateVar renderGetScale renderSetScale
828828
rendererClipRect :: Renderer -> StateVar (Maybe (Rectangle CInt))
829829
rendererClipRect (Renderer r) = makeStateVar renderGetClipRect renderSetClipRect
830830
where
831-
renderGetClipRect = liftIO $
831+
renderGetClipRect =
832832
alloca $ \rPtr -> do
833833
Raw.renderGetClipRect r rPtr
834834
maybePeek peek (castPtr rPtr)
835835
renderSetClipRect rect =
836-
liftIO $
837836
throwIfNeg_ "SDL.Video.renderSetClipRect" "SDL_RenderSetClipRect" $
838837
maybeWith with rect $ Raw.renderSetClipRect r . castPtr
839838

@@ -845,13 +844,12 @@ rendererClipRect (Renderer r) = makeStateVar renderGetClipRect renderSetClipRect
845844
rendererViewport :: Renderer -> StateVar (Maybe (Rectangle CInt))
846845
rendererViewport (Renderer r) = makeStateVar renderGetViewport renderSetViewport
847846
where
848-
renderGetViewport = liftIO $
847+
renderGetViewport =
849848
alloca $ \rect -> do
850849
Raw.renderGetViewport r rect
851850
maybePeek peek (castPtr rect)
852851

853852
renderSetViewport rect =
854-
liftIO $
855853
throwIfNeg_ "SDL.Video.renderSetViewport" "SDL_RenderSetViewport" $
856854
maybeWith with rect $ Raw.renderSetViewport r . castPtr
857855

@@ -992,7 +990,6 @@ surfaceColorKey :: Surface -> StateVar (Maybe (V4 Word8))
992990
surfaceColorKey (Surface s _) = makeStateVar getColorKey setColorKey
993991
where
994992
getColorKey =
995-
liftIO $
996993
alloca $ \keyPtr -> do
997994
ret <- Raw.getColorKey s keyPtr
998995
if ret == -1
@@ -1006,7 +1003,6 @@ surfaceColorKey (Surface s _) = makeStateVar getColorKey setColorKey
10061003
do Raw.getRGBA mapped format r g b a
10071004
Just <$> (V4 <$> peek r <*> peek g <*> peek b <*> peek a)
10081005
setColorKey key =
1009-
liftIO $
10101006
throwIfNeg_ "SDL.Video.Renderer.setColorKey" "SDL_SetColorKey" $
10111007
case key of
10121008
Nothing ->
@@ -1032,7 +1028,7 @@ surfaceColorKey (Surface s _) = makeStateVar getColorKey setColorKey
10321028
textureColorMod :: Texture -> StateVar (V3 Word8)
10331029
textureColorMod (Texture t) = makeStateVar getTextureColorMod setTextureColorMod
10341030
where
1035-
getTextureColorMod = liftIO $
1031+
getTextureColorMod =
10361032
alloca $ \r ->
10371033
alloca $ \g ->
10381034
alloca $ \b -> do
@@ -1272,7 +1268,7 @@ getRenderDriverInfo = liftIO $ do
12721268
textureAlphaMod :: Texture -> StateVar Word8
12731269
textureAlphaMod (Texture t) = makeStateVar getTextureAlphaMod setTextureAlphaMod
12741270
where
1275-
getTextureAlphaMod = liftIO $
1271+
getTextureAlphaMod =
12761272
alloca $ \x -> do
12771273
throwIfNeg_ "SDL.Video.Renderer.getTextureAlphaMod" "SDL_GetTextureAlphaMod" $
12781274
Raw.getTextureAlphaMod t x
@@ -1290,7 +1286,7 @@ textureAlphaMod (Texture t) = makeStateVar getTextureAlphaMod setTextureAlphaMod
12901286
textureBlendMode :: Texture -> StateVar BlendMode
12911287
textureBlendMode (Texture t) = makeStateVar getTextureBlendMode setTextureBlendMode
12921288
where
1293-
getTextureBlendMode = liftIO $
1289+
getTextureBlendMode =
12941290
alloca $ \x -> do
12951291
throwIfNeg_ "SDL.Video.Renderer.getTextureBlendMode" "SDL_GetTextureBlendMode" $
12961292
Raw.getTextureBlendMode t x
@@ -1308,7 +1304,7 @@ textureBlendMode (Texture t) = makeStateVar getTextureBlendMode setTextureBlendM
13081304
surfaceBlendMode :: Surface -> StateVar BlendMode
13091305
surfaceBlendMode (Surface s _) = makeStateVar getSurfaceBlendMode setSurfaceBlendMode
13101306
where
1311-
getSurfaceBlendMode = liftIO $
1307+
getSurfaceBlendMode =
13121308
alloca $ \x -> do
13131309
throwIfNeg_ "SDL.Video.Renderer.getSurfaceBlendMode" "SDL_GetSurfaceBlendMode" $
13141310
Raw.getSurfaceBlendMode s x
@@ -1364,7 +1360,7 @@ rendererIntegerScale (Renderer r) = makeStateVar renderGetIntegerScale renderSet
13641360
rendererLogicalSize :: Renderer -> StateVar (Maybe (V2 CInt))
13651361
rendererLogicalSize (Renderer r) = makeStateVar renderGetLogicalSize renderSetLogicalSize
13661362
where
1367-
renderGetLogicalSize = liftIO $
1363+
renderGetLogicalSize =
13681364
alloca $ \w -> do
13691365
alloca $ \h -> do
13701366
Raw.renderGetLogicalSize r w h

0 commit comments

Comments
 (0)