# HG changeset patch # User Sam Lantinga # Date 1230710216 0 # Node ID 066384910f504a50f2d7cfed8c08fb15657d7781 # Parent 59e3e0aaa725f7c4b388d6f5219c623827653271 iPhone build compiles again (drawing routines need to be implemented) diff -r 59e3e0aaa725 -r 066384910f50 XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj --- a/XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Wed Dec 31 07:35:55 2008 +0000 +++ b/XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj Wed Dec 31 07:56:56 2008 +0000 @@ -25,6 +25,22 @@ /* Begin PBXBuildFile section */ 04461DEE0EA76BA3006C462D /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04461DED0EA76BA3006C462D /* SDL_haptic.h */; }; 04461DEF0EA76BA3006C462D /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04461DED0EA76BA3006C462D /* SDL_haptic.h */; }; + 0463873F0F0B5B7D0041FD65 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387370F0B5B7D0041FD65 /* SDL_blendline.c */; }; + 046387400F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */; }; + 046387410F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */; }; + 046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */; }; + 046387430F0B5B7D0041FD65 /* SDL_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */; }; + 046387440F0B5B7D0041FD65 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */; }; + 046387450F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */; }; + 046387460F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */; }; + 046387470F0B5B7D0041FD65 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387370F0B5B7D0041FD65 /* SDL_blendline.c */; }; + 046387480F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */; }; + 046387490F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */; }; + 0463874A0F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */; }; + 0463874B0F0B5B7D0041FD65 /* SDL_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */; }; + 0463874C0F0B5B7D0041FD65 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */; }; + 0463874D0F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */; }; + 0463874E0F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */; }; 047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 047677B80EA76A31008ABAF1 /* SDL_syshaptic.c */; }; 047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 047677B90EA76A31008ABAF1 /* SDL_haptic.c */; }; 047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 047677BA0EA76A31008ABAF1 /* SDL_syshaptic.h */; }; @@ -179,7 +195,6 @@ FDA684560DF2374E00F98A1A /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683090DF2374E00F98A1A /* SDL_blit_N.c */; }; FDA684570DF2374E00F98A1A /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */; }; FDA684580DF2374E00F98A1A /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */; }; - FDA684590DF2374E00F98A1A /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830C0DF2374E00F98A1A /* SDL_fill.c */; }; FDA6845A0DF2374E00F98A1A /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */; }; FDA6845B0DF2374E00F98A1A /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */; }; FDA6845C0DF2374E00F98A1A /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */; }; @@ -191,7 +206,6 @@ FDA684620DF2374E00F98A1A /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */; }; FDA684630DF2374E00F98A1A /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */; }; FDA684640DF2374E00F98A1A /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683170DF2374E00F98A1A /* SDL_stretch.c */; }; - FDA684650DF2374E00F98A1A /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */; }; FDA684660DF2374E00F98A1A /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683190DF2374E00F98A1A /* SDL_surface.c */; }; FDA684670DF2374E00F98A1A /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */; }; FDA684680DF2374E00F98A1A /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6831B0DF2374E00F98A1A /* SDL_video.c */; }; @@ -256,7 +270,6 @@ FDBB64B60E159B23003B3114 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683120DF2374E00F98A1A /* SDL_rect_c.h */; }; FDBB64B70E159B23003B3114 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683140DF2374E00F98A1A /* SDL_renderer_sw.h */; }; FDBB64B80E159B23003B3114 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */; }; - FDBB64B90E159B23003B3114 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */; }; FDBB64BA0E159B23003B3114 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */; }; FDBB64BB0E159B23003B3114 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831E0DF2374E00F98A1A /* SDL_yuv_sw_c.h */; }; FDBB64C40E159B23003B3114 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA685F60DF244C800F98A1A /* SDL_nullevents_c.h */; }; @@ -310,7 +323,6 @@ FDBB64F80E159B23003B3114 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683090DF2374E00F98A1A /* SDL_blit_N.c */; }; FDBB64F90E159B23003B3114 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */; }; FDBB64FA0E159B23003B3114 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */; }; - FDBB64FB0E159B23003B3114 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830C0DF2374E00F98A1A /* SDL_fill.c */; }; FDBB64FC0E159B23003B3114 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */; }; FDBB64FD0E159B23003B3114 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */; }; FDBB64FE0E159B23003B3114 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683110DF2374E00F98A1A /* SDL_rect.c */; }; @@ -350,6 +362,14 @@ /* Begin PBXFileReference section */ 04461DED0EA76BA3006C462D /* SDL_haptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_haptic.h; path = ../../include/SDL_haptic.h; sourceTree = SOURCE_ROOT; }; + 046387370F0B5B7D0041FD65 /* SDL_blendline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendline.c; sourceTree = ""; }; + 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendpoint.c; sourceTree = ""; }; + 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendrect.c; sourceTree = ""; }; + 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blit_slow.h; sourceTree = ""; }; + 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_draw.h; sourceTree = ""; }; + 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawline.c; sourceTree = ""; }; + 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawpoint.c; sourceTree = ""; }; + 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_fillrect.c; sourceTree = ""; }; 047677B80EA76A31008ABAF1 /* SDL_syshaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syshaptic.c; sourceTree = ""; }; 047677B90EA76A31008ABAF1 /* SDL_haptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = SDL_haptic.c; path = ../../src/haptic/SDL_haptic.c; sourceTree = SOURCE_ROOT; }; 047677BA0EA76A31008ABAF1 /* SDL_syshaptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_syshaptic.h; path = ../../src/haptic/SDL_syshaptic.h; sourceTree = SOURCE_ROOT; }; @@ -508,7 +528,6 @@ FDA683090DF2374E00F98A1A /* SDL_blit_N.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_N.c; sourceTree = ""; }; FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_slow.c; sourceTree = ""; }; FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_bmp.c; sourceTree = ""; }; - FDA6830C0DF2374E00F98A1A /* SDL_fill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_fill.c; sourceTree = ""; }; FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gamma.c; sourceTree = ""; }; FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_leaks.h; sourceTree = ""; }; FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_pixels.c; sourceTree = ""; }; @@ -520,7 +539,6 @@ FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_RLEaccel.c; sourceTree = ""; }; FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_RLEaccel_c.h; sourceTree = ""; }; FDA683170DF2374E00F98A1A /* SDL_stretch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_stretch.c; sourceTree = ""; }; - FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_stretch_c.h; sourceTree = ""; }; FDA683190DF2374E00F98A1A /* SDL_surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_surface.c; sourceTree = ""; }; FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysvideo.h; sourceTree = ""; }; FDA6831B0DF2374E00F98A1A /* SDL_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_video.c; sourceTree = ""; }; @@ -915,6 +933,9 @@ 0495E6870E97408800152DFE /* SDL_renderer_gl.h */, 0495E6880E97408800152DFE /* SDL_renderer_gles.c */, 0495E6890E97408800152DFE /* SDL_renderer_gles.h */, + 046387370F0B5B7D0041FD65 /* SDL_blendline.c */, + 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */, + 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */, FDA683000DF2374E00F98A1A /* SDL_blit.c */, FDA683010DF2374E00F98A1A /* SDL_blit.h */, FDA683020DF2374E00F98A1A /* SDL_blit_0.c */, @@ -926,8 +947,12 @@ FDA683080DF2374E00F98A1A /* SDL_blit_copy.h */, FDA683090DF2374E00F98A1A /* SDL_blit_N.c */, FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */, + 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */, FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */, - FDA6830C0DF2374E00F98A1A /* SDL_fill.c */, + 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */, + 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */, + 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */, + 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */, FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */, FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */, FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */, @@ -939,7 +964,6 @@ FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */, FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */, FDA683170DF2374E00F98A1A /* SDL_stretch.c */, - FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */, FDA683190DF2374E00F98A1A /* SDL_surface.c */, FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */, FDA6831B0DF2374E00F98A1A /* SDL_video.c */, @@ -1038,7 +1062,6 @@ FDA6845F0DF2374E00F98A1A /* SDL_rect_c.h in Headers */, FDA684610DF2374E00F98A1A /* SDL_renderer_sw.h in Headers */, FDA684630DF2374E00F98A1A /* SDL_RLEaccel_c.h in Headers */, - FDA684650DF2374E00F98A1A /* SDL_stretch_c.h in Headers */, FDA684670DF2374E00F98A1A /* SDL_sysvideo.h in Headers */, FDA6846B0DF2374E00F98A1A /* SDL_yuv_sw_c.h in Headers */, FDA685FC0DF244C800F98A1A /* SDL_nullevents_c.h in Headers */, @@ -1063,6 +1086,8 @@ 0495E68F0E97408800152DFE /* SDL_renderer_gles.h in Headers */, 047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */, 04461DEE0EA76BA3006C462D /* SDL_haptic.h in Headers */, + 046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */, + 046387430F0B5B7D0041FD65 /* SDL_draw.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1118,7 +1143,6 @@ FDBB64B60E159B23003B3114 /* SDL_rect_c.h in Headers */, FDBB64B70E159B23003B3114 /* SDL_renderer_sw.h in Headers */, FDBB64B80E159B23003B3114 /* SDL_RLEaccel_c.h in Headers */, - FDBB64B90E159B23003B3114 /* SDL_stretch_c.h in Headers */, FDBB64BA0E159B23003B3114 /* SDL_sysvideo.h in Headers */, FDBB64BB0E159B23003B3114 /* SDL_yuv_sw_c.h in Headers */, FDBB64C40E159B23003B3114 /* SDL_nullevents_c.h in Headers */, @@ -1143,6 +1167,8 @@ 0495E6950E97408800152DFE /* SDL_renderer_gles.h in Headers */, 047677C00EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */, 04461DEF0EA76BA3006C462D /* SDL_haptic.h in Headers */, + 0463874A0F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */, + 0463874B0F0B5B7D0041FD65 /* SDL_draw.h in Headers */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1297,7 +1323,6 @@ FDA684560DF2374E00F98A1A /* SDL_blit_N.c in Sources */, FDA684570DF2374E00F98A1A /* SDL_blit_slow.c in Sources */, FDA684580DF2374E00F98A1A /* SDL_bmp.c in Sources */, - FDA684590DF2374E00F98A1A /* SDL_fill.c in Sources */, FDA6845A0DF2374E00F98A1A /* SDL_gamma.c in Sources */, FDA6845C0DF2374E00F98A1A /* SDL_pixels.c in Sources */, FDA6845E0DF2374E00F98A1A /* SDL_rect.c in Sources */, @@ -1331,6 +1356,12 @@ 047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */, 047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */, 047AF1B30EA98D6C00811173 /* SDL_sysloadso.c in Sources */, + 0463873F0F0B5B7D0041FD65 /* SDL_blendline.c in Sources */, + 046387400F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */, + 046387410F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */, + 046387440F0B5B7D0041FD65 /* SDL_drawline.c in Sources */, + 046387450F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */, + 046387460F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1386,7 +1417,6 @@ FDBB64F80E159B23003B3114 /* SDL_blit_N.c in Sources */, FDBB64F90E159B23003B3114 /* SDL_blit_slow.c in Sources */, FDBB64FA0E159B23003B3114 /* SDL_bmp.c in Sources */, - FDBB64FB0E159B23003B3114 /* SDL_fill.c in Sources */, FDBB64FC0E159B23003B3114 /* SDL_gamma.c in Sources */, FDBB64FD0E159B23003B3114 /* SDL_pixels.c in Sources */, FDBB64FE0E159B23003B3114 /* SDL_rect.c in Sources */, @@ -1418,6 +1448,12 @@ 047677BE0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */, 047677BF0EA76A31008ABAF1 /* SDL_haptic.c in Sources */, 047AF1B40EA98D6C00811173 /* SDL_sysloadso.c in Sources */, + 046387470F0B5B7D0041FD65 /* SDL_blendline.c in Sources */, + 046387480F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */, + 046387490F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */, + 0463874C0F0B5B7D0041FD65 /* SDL_drawline.c in Sources */, + 0463874D0F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */, + 0463874E0F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff -r 59e3e0aaa725 -r 066384910f50 src/video/SDL_renderer_gl.c --- a/src/video/SDL_renderer_gl.c Wed Dec 31 07:35:55 2008 +0000 +++ b/src/video/SDL_renderer_gl.c Wed Dec 31 07:56:56 2008 +0000 @@ -434,36 +434,6 @@ return renderer; } -static void -SetBlendMode(GL_RenderData * data, int blendMode) -{ - if (blendMode != data->blendMode) { - switch (blendMode) { - case SDL_BLENDMODE_NONE: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); - data->glDisable(GL_BLEND); - break; - case SDL_BLENDMODE_MASK: - case SDL_BLENDMODE_BLEND: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - break; - case SDL_BLENDMODE_ADD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_SRC_ALPHA, GL_ONE); - break; - case SDL_BLENDMODE_MOD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_ZERO, GL_SRC_COLOR); - break; - } - data->blendMode = blendMode; - } -} - static int GL_ActivateRenderer(SDL_Renderer * renderer) { @@ -1066,12 +1036,42 @@ } } +static void +GL_SetBlendMode(GL_RenderData * data, int blendMode) +{ + if (blendMode != data->blendMode) { + switch (blendMode) { + case SDL_BLENDMODE_NONE: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + data->glDisable(GL_BLEND); + break; + case SDL_BLENDMODE_MASK: + case SDL_BLENDMODE_BLEND: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + break; + case SDL_BLENDMODE_ADD: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_SRC_ALPHA, GL_ONE); + break; + case SDL_BLENDMODE_MOD: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_ZERO, GL_SRC_COLOR); + break; + } + data->blendMode = blendMode; + } +} + static int GL_RenderPoint(SDL_Renderer * renderer, int x, int y) { GL_RenderData *data = (GL_RenderData *) renderer->driverdata; - SetBlendMode(data, renderer->blendMode); + GL_SetBlendMode(data, renderer->blendMode); data->glColor4f((GLfloat) renderer->r * inv255f, (GLfloat) renderer->g * inv255f, @@ -1090,7 +1090,7 @@ { GL_RenderData *data = (GL_RenderData *) renderer->driverdata; - SetBlendMode(data, renderer->blendMode); + GL_SetBlendMode(data, renderer->blendMode); data->glColor4f((GLfloat) renderer->r * inv255f, (GLfloat) renderer->g * inv255f, @@ -1111,11 +1111,13 @@ GL_RenderData *data = (GL_RenderData *) renderer->driverdata; SDL_Window *window = SDL_GetWindowFromID(renderer->window); + GL_SetBlendMode(data, renderer->blendMode); + data->glColor4f((GLfloat) renderer->r * inv255f, (GLfloat) renderer->g * inv255f, (GLfloat) renderer->b * inv255f, (GLfloat) renderer->a * inv255f); - SetBlendMode(data, renderer->blendMode); + data->glRecti(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h); return 0; @@ -1178,7 +1180,7 @@ data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } - SetBlendMode(data, texture->blendMode); + GL_SetBlendMode(data, texture->blendMode); if (texture->scaleMode != data->scaleMode) { switch (texture->scaleMode) { diff -r 59e3e0aaa725 -r 066384910f50 src/video/SDL_renderer_gles.c --- a/src/video/SDL_renderer_gles.c Wed Dec 31 07:35:55 2008 +0000 +++ b/src/video/SDL_renderer_gles.c Wed Dec 31 07:56:56 2008 +0000 @@ -66,8 +66,10 @@ SDL_Texture * texture); static void GLES_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture, int numrects, const SDL_Rect * rects); -static int GLES_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, - Uint8 a, const SDL_Rect * rect); +static int GLES_RenderPoint(SDL_Renderer * renderer, int x, int y); +static int GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, + int y2); +static int GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect); static int GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture, const SDL_Rect * srcrect, const SDL_Rect * dstrect); @@ -226,6 +228,8 @@ renderer->LockTexture = GLES_LockTexture; renderer->UnlockTexture = GLES_UnlockTexture; renderer->DirtyTexture = GLES_DirtyTexture; + renderer->RenderPoint = GLES_RenderPoint; + renderer->RenderLine = GLES_RenderLine; renderer->RenderFill = GLES_RenderFill; renderer->RenderCopy = GLES_RenderCopy; renderer->RenderPresent = GLES_RenderPresent; @@ -586,31 +590,93 @@ } } +static void +GLES_SetBlendMode(GLES_RenderData * data, int blendMode) +{ + if (blendMode != data->blendMode) { + switch (blendMode) { + case SDL_BLENDMODE_NONE: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE); + data->glDisable(GL_BLEND); + break; + case SDL_BLENDMODE_MASK: + case SDL_BLENDMODE_BLEND: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); + break; + case SDL_BLENDMODE_ADD: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_SRC_ALPHA, GL_ONE); + break; + case SDL_BLENDMODE_MOD: + data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); + data->glEnable(GL_BLEND); + data->glBlendFunc(GL_ZERO, GL_SRC_COLOR); + break; + } + data->blendMode = blendMode; + } +} + static int -GLES_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a, - const SDL_Rect * rect) +GLES_RenderPoint(SDL_Renderer * renderer, int x, int y) +{ + GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; + + GLES_SetBlendMode(data, renderer->blendMode); + + data->glColor4f((GLfloat) renderer->r * inv255f, + (GLfloat) renderer->g * inv255f, + (GLfloat) renderer->b * inv255f, + (GLfloat) renderer->a * inv255f); + +/* FIXME: + data->glBegin(GL_POINTS); + data->glVertex2i(x, y); + data->glEnd(); +*/ + return 0; +} + +static int +GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2) { + GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; + GLES_SetBlendMode(data, renderer->blendMode); + + data->glColor4f((GLfloat) renderer->r * inv255f, + (GLfloat) renderer->g * inv255f, + (GLfloat) renderer->b * inv255f, + (GLfloat) renderer->a * inv255f); + +/* FIXME: + data->glBegin(GL_LINES); + data->glVertex2i(x1, y1); + data->glVertex2i(x2, y2); + data->glEnd(); +*/ + return 0; +} + +static int +GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect) +{ GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata; SDL_Window *window = SDL_GetWindowFromID(renderer->window); - /* set proper drawing color */ - GLfloat oldClearColor[4]; - - data->glGetFloatv(GL_COLOR_CLEAR_VALUE, oldClearColor); - - data->glClearColor((GLclampf) r * inv255f, (GLclampf) g * inv255f, - (GLclampf) b * inv255f, (GLclampf) a * inv255f); + GLES_SetBlendMode(data, renderer->blendMode); - data->glScissor(rect->x, window->h - rect->y - rect->h, rect->w, rect->h); - data->glEnable(GL_SCISSOR_TEST); - data->glClear(GL_COLOR_BUFFER_BIT); - data->glDisable(GL_SCISSOR_TEST); + data->glColor4f((GLfloat) renderer->r * inv255f, + (GLfloat) renderer->g * inv255f, + (GLfloat) renderer->b * inv255f, + (GLfloat) renderer->a * inv255f); - /* reset clear color */ - data->glClearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2], - oldClearColor[2]); - +/* FIXME: + data->glRecti(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h); +*/ return 0; } @@ -677,31 +743,7 @@ data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f); } - if (texture->blendMode != data->blendMode) { - switch (texture->blendMode) { - case SDL_BLENDMODE_NONE: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL); - data->glDisable(GL_BLEND); - break; - case SDL_BLENDMODE_MASK: - case SDL_BLENDMODE_BLEND: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA); - break; - case SDL_BLENDMODE_ADD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_SRC_ALPHA, GL_ONE); - break; - case SDL_BLENDMODE_MOD: - data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE); - data->glEnable(GL_BLEND); - data->glBlendFunc(GL_ZERO, GL_SRC_COLOR); - break; - } - data->blendMode = texture->blendMode; - } + GLES_SetBlendMode(data, texture->blendMode); switch (texture->scaleMode) { case SDL_TEXTURESCALEMODE_NONE: