iPhone build compiles again (drawing routines need to be implemented)
authorSam Lantinga <slouken@libsdl.org>
Wed, 31 Dec 2008 07:56:56 +0000
changeset 2936066384910f50
parent 2935 59e3e0aaa725
child 2937 017d4334accf
iPhone build compiles again (drawing routines need to be implemented)
XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj
src/video/SDL_renderer_gl.c
src/video/SDL_renderer_gles.c
     1.1 --- a/XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Wed Dec 31 07:35:55 2008 +0000
     1.2 +++ b/XCodeiPhoneOS/SDL/SDLiPhoneOS.xcodeproj/project.pbxproj	Wed Dec 31 07:56:56 2008 +0000
     1.3 @@ -25,6 +25,22 @@
     1.4  /* Begin PBXBuildFile section */
     1.5  		04461DEE0EA76BA3006C462D /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04461DED0EA76BA3006C462D /* SDL_haptic.h */; };
     1.6  		04461DEF0EA76BA3006C462D /* SDL_haptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 04461DED0EA76BA3006C462D /* SDL_haptic.h */; };
     1.7 +		0463873F0F0B5B7D0041FD65 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387370F0B5B7D0041FD65 /* SDL_blendline.c */; };
     1.8 +		046387400F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */; };
     1.9 +		046387410F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */; };
    1.10 +		046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */; };
    1.11 +		046387430F0B5B7D0041FD65 /* SDL_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */; };
    1.12 +		046387440F0B5B7D0041FD65 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */; };
    1.13 +		046387450F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */; };
    1.14 +		046387460F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */; };
    1.15 +		046387470F0B5B7D0041FD65 /* SDL_blendline.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387370F0B5B7D0041FD65 /* SDL_blendline.c */; };
    1.16 +		046387480F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */; };
    1.17 +		046387490F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 046387390F0B5B7D0041FD65 /* SDL_blendrect.c */; };
    1.18 +		0463874A0F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */; };
    1.19 +		0463874B0F0B5B7D0041FD65 /* SDL_draw.h in Headers */ = {isa = PBXBuildFile; fileRef = 0463873B0F0B5B7D0041FD65 /* SDL_draw.h */; };
    1.20 +		0463874C0F0B5B7D0041FD65 /* SDL_drawline.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */; };
    1.21 +		0463874D0F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */; };
    1.22 +		0463874E0F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */ = {isa = PBXBuildFile; fileRef = 0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */; };
    1.23  		047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 047677B80EA76A31008ABAF1 /* SDL_syshaptic.c */; };
    1.24  		047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 047677B90EA76A31008ABAF1 /* SDL_haptic.c */; };
    1.25  		047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */ = {isa = PBXBuildFile; fileRef = 047677BA0EA76A31008ABAF1 /* SDL_syshaptic.h */; };
    1.26 @@ -179,7 +195,6 @@
    1.27  		FDA684560DF2374E00F98A1A /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683090DF2374E00F98A1A /* SDL_blit_N.c */; };
    1.28  		FDA684570DF2374E00F98A1A /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */; };
    1.29  		FDA684580DF2374E00F98A1A /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */; };
    1.30 -		FDA684590DF2374E00F98A1A /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830C0DF2374E00F98A1A /* SDL_fill.c */; };
    1.31  		FDA6845A0DF2374E00F98A1A /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */; };
    1.32  		FDA6845B0DF2374E00F98A1A /* SDL_leaks.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */; };
    1.33  		FDA6845C0DF2374E00F98A1A /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */; };
    1.34 @@ -191,7 +206,6 @@
    1.35  		FDA684620DF2374E00F98A1A /* SDL_RLEaccel.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */; };
    1.36  		FDA684630DF2374E00F98A1A /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */; };
    1.37  		FDA684640DF2374E00F98A1A /* SDL_stretch.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683170DF2374E00F98A1A /* SDL_stretch.c */; };
    1.38 -		FDA684650DF2374E00F98A1A /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */; };
    1.39  		FDA684660DF2374E00F98A1A /* SDL_surface.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683190DF2374E00F98A1A /* SDL_surface.c */; };
    1.40  		FDA684670DF2374E00F98A1A /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */; };
    1.41  		FDA684680DF2374E00F98A1A /* SDL_video.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6831B0DF2374E00F98A1A /* SDL_video.c */; };
    1.42 @@ -256,7 +270,6 @@
    1.43  		FDBB64B60E159B23003B3114 /* SDL_rect_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683120DF2374E00F98A1A /* SDL_rect_c.h */; };
    1.44  		FDBB64B70E159B23003B3114 /* SDL_renderer_sw.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683140DF2374E00F98A1A /* SDL_renderer_sw.h */; };
    1.45  		FDBB64B80E159B23003B3114 /* SDL_RLEaccel_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */; };
    1.46 -		FDBB64B90E159B23003B3114 /* SDL_stretch_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */; };
    1.47  		FDBB64BA0E159B23003B3114 /* SDL_sysvideo.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */; };
    1.48  		FDBB64BB0E159B23003B3114 /* SDL_yuv_sw_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA6831E0DF2374E00F98A1A /* SDL_yuv_sw_c.h */; };
    1.49  		FDBB64C40E159B23003B3114 /* SDL_nullevents_c.h in Headers */ = {isa = PBXBuildFile; fileRef = FDA685F60DF244C800F98A1A /* SDL_nullevents_c.h */; };
    1.50 @@ -310,7 +323,6 @@
    1.51  		FDBB64F80E159B23003B3114 /* SDL_blit_N.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683090DF2374E00F98A1A /* SDL_blit_N.c */; };
    1.52  		FDBB64F90E159B23003B3114 /* SDL_blit_slow.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */; };
    1.53  		FDBB64FA0E159B23003B3114 /* SDL_bmp.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */; };
    1.54 -		FDBB64FB0E159B23003B3114 /* SDL_fill.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830C0DF2374E00F98A1A /* SDL_fill.c */; };
    1.55  		FDBB64FC0E159B23003B3114 /* SDL_gamma.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */; };
    1.56  		FDBB64FD0E159B23003B3114 /* SDL_pixels.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */; };
    1.57  		FDBB64FE0E159B23003B3114 /* SDL_rect.c in Sources */ = {isa = PBXBuildFile; fileRef = FDA683110DF2374E00F98A1A /* SDL_rect.c */; };
    1.58 @@ -350,6 +362,14 @@
    1.59  
    1.60  /* Begin PBXFileReference section */
    1.61  		04461DED0EA76BA3006C462D /* SDL_haptic.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SDL_haptic.h; path = ../../include/SDL_haptic.h; sourceTree = SOURCE_ROOT; };
    1.62 +		046387370F0B5B7D0041FD65 /* SDL_blendline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendline.c; sourceTree = "<group>"; };
    1.63 +		046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendpoint.c; sourceTree = "<group>"; };
    1.64 +		046387390F0B5B7D0041FD65 /* SDL_blendrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blendrect.c; sourceTree = "<group>"; };
    1.65 +		0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_blit_slow.h; sourceTree = "<group>"; };
    1.66 +		0463873B0F0B5B7D0041FD65 /* SDL_draw.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_draw.h; sourceTree = "<group>"; };
    1.67 +		0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawline.c; sourceTree = "<group>"; };
    1.68 +		0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_drawpoint.c; sourceTree = "<group>"; };
    1.69 +		0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_fillrect.c; sourceTree = "<group>"; };
    1.70  		047677B80EA76A31008ABAF1 /* SDL_syshaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_syshaptic.c; sourceTree = "<group>"; };
    1.71  		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; };
    1.72  		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; };
    1.73 @@ -508,7 +528,6 @@
    1.74  		FDA683090DF2374E00F98A1A /* SDL_blit_N.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_N.c; sourceTree = "<group>"; };
    1.75  		FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_blit_slow.c; sourceTree = "<group>"; };
    1.76  		FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_bmp.c; sourceTree = "<group>"; };
    1.77 -		FDA6830C0DF2374E00F98A1A /* SDL_fill.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_fill.c; sourceTree = "<group>"; };
    1.78  		FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_gamma.c; sourceTree = "<group>"; };
    1.79  		FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_leaks.h; sourceTree = "<group>"; };
    1.80  		FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_pixels.c; sourceTree = "<group>"; };
    1.81 @@ -520,7 +539,6 @@
    1.82  		FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_RLEaccel.c; sourceTree = "<group>"; };
    1.83  		FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_RLEaccel_c.h; sourceTree = "<group>"; };
    1.84  		FDA683170DF2374E00F98A1A /* SDL_stretch.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_stretch.c; sourceTree = "<group>"; };
    1.85 -		FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_stretch_c.h; sourceTree = "<group>"; };
    1.86  		FDA683190DF2374E00F98A1A /* SDL_surface.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_surface.c; sourceTree = "<group>"; };
    1.87  		FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDL_sysvideo.h; sourceTree = "<group>"; };
    1.88  		FDA6831B0DF2374E00F98A1A /* SDL_video.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = SDL_video.c; sourceTree = "<group>"; };
    1.89 @@ -915,6 +933,9 @@
    1.90  				0495E6870E97408800152DFE /* SDL_renderer_gl.h */,
    1.91  				0495E6880E97408800152DFE /* SDL_renderer_gles.c */,
    1.92  				0495E6890E97408800152DFE /* SDL_renderer_gles.h */,
    1.93 +				046387370F0B5B7D0041FD65 /* SDL_blendline.c */,
    1.94 +				046387380F0B5B7D0041FD65 /* SDL_blendpoint.c */,
    1.95 +				046387390F0B5B7D0041FD65 /* SDL_blendrect.c */,
    1.96  				FDA683000DF2374E00F98A1A /* SDL_blit.c */,
    1.97  				FDA683010DF2374E00F98A1A /* SDL_blit.h */,
    1.98  				FDA683020DF2374E00F98A1A /* SDL_blit_0.c */,
    1.99 @@ -926,8 +947,12 @@
   1.100  				FDA683080DF2374E00F98A1A /* SDL_blit_copy.h */,
   1.101  				FDA683090DF2374E00F98A1A /* SDL_blit_N.c */,
   1.102  				FDA6830A0DF2374E00F98A1A /* SDL_blit_slow.c */,
   1.103 +				0463873A0F0B5B7D0041FD65 /* SDL_blit_slow.h */,
   1.104  				FDA6830B0DF2374E00F98A1A /* SDL_bmp.c */,
   1.105 -				FDA6830C0DF2374E00F98A1A /* SDL_fill.c */,
   1.106 +				0463873B0F0B5B7D0041FD65 /* SDL_draw.h */,
   1.107 +				0463873C0F0B5B7D0041FD65 /* SDL_drawline.c */,
   1.108 +				0463873D0F0B5B7D0041FD65 /* SDL_drawpoint.c */,
   1.109 +				0463873E0F0B5B7D0041FD65 /* SDL_fillrect.c */,
   1.110  				FDA6830D0DF2374E00F98A1A /* SDL_gamma.c */,
   1.111  				FDA6830E0DF2374E00F98A1A /* SDL_leaks.h */,
   1.112  				FDA6830F0DF2374E00F98A1A /* SDL_pixels.c */,
   1.113 @@ -939,7 +964,6 @@
   1.114  				FDA683150DF2374E00F98A1A /* SDL_RLEaccel.c */,
   1.115  				FDA683160DF2374E00F98A1A /* SDL_RLEaccel_c.h */,
   1.116  				FDA683170DF2374E00F98A1A /* SDL_stretch.c */,
   1.117 -				FDA683180DF2374E00F98A1A /* SDL_stretch_c.h */,
   1.118  				FDA683190DF2374E00F98A1A /* SDL_surface.c */,
   1.119  				FDA6831A0DF2374E00F98A1A /* SDL_sysvideo.h */,
   1.120  				FDA6831B0DF2374E00F98A1A /* SDL_video.c */,
   1.121 @@ -1038,7 +1062,6 @@
   1.122  				FDA6845F0DF2374E00F98A1A /* SDL_rect_c.h in Headers */,
   1.123  				FDA684610DF2374E00F98A1A /* SDL_renderer_sw.h in Headers */,
   1.124  				FDA684630DF2374E00F98A1A /* SDL_RLEaccel_c.h in Headers */,
   1.125 -				FDA684650DF2374E00F98A1A /* SDL_stretch_c.h in Headers */,
   1.126  				FDA684670DF2374E00F98A1A /* SDL_sysvideo.h in Headers */,
   1.127  				FDA6846B0DF2374E00F98A1A /* SDL_yuv_sw_c.h in Headers */,
   1.128  				FDA685FC0DF244C800F98A1A /* SDL_nullevents_c.h in Headers */,
   1.129 @@ -1063,6 +1086,8 @@
   1.130  				0495E68F0E97408800152DFE /* SDL_renderer_gles.h in Headers */,
   1.131  				047677BD0EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */,
   1.132  				04461DEE0EA76BA3006C462D /* SDL_haptic.h in Headers */,
   1.133 +				046387420F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */,
   1.134 +				046387430F0B5B7D0041FD65 /* SDL_draw.h in Headers */,
   1.135  			);
   1.136  			runOnlyForDeploymentPostprocessing = 0;
   1.137  		};
   1.138 @@ -1118,7 +1143,6 @@
   1.139  				FDBB64B60E159B23003B3114 /* SDL_rect_c.h in Headers */,
   1.140  				FDBB64B70E159B23003B3114 /* SDL_renderer_sw.h in Headers */,
   1.141  				FDBB64B80E159B23003B3114 /* SDL_RLEaccel_c.h in Headers */,
   1.142 -				FDBB64B90E159B23003B3114 /* SDL_stretch_c.h in Headers */,
   1.143  				FDBB64BA0E159B23003B3114 /* SDL_sysvideo.h in Headers */,
   1.144  				FDBB64BB0E159B23003B3114 /* SDL_yuv_sw_c.h in Headers */,
   1.145  				FDBB64C40E159B23003B3114 /* SDL_nullevents_c.h in Headers */,
   1.146 @@ -1143,6 +1167,8 @@
   1.147  				0495E6950E97408800152DFE /* SDL_renderer_gles.h in Headers */,
   1.148  				047677C00EA76A31008ABAF1 /* SDL_syshaptic.h in Headers */,
   1.149  				04461DEF0EA76BA3006C462D /* SDL_haptic.h in Headers */,
   1.150 +				0463874A0F0B5B7D0041FD65 /* SDL_blit_slow.h in Headers */,
   1.151 +				0463874B0F0B5B7D0041FD65 /* SDL_draw.h in Headers */,
   1.152  			);
   1.153  			runOnlyForDeploymentPostprocessing = 0;
   1.154  		};
   1.155 @@ -1297,7 +1323,6 @@
   1.156  				FDA684560DF2374E00F98A1A /* SDL_blit_N.c in Sources */,
   1.157  				FDA684570DF2374E00F98A1A /* SDL_blit_slow.c in Sources */,
   1.158  				FDA684580DF2374E00F98A1A /* SDL_bmp.c in Sources */,
   1.159 -				FDA684590DF2374E00F98A1A /* SDL_fill.c in Sources */,
   1.160  				FDA6845A0DF2374E00F98A1A /* SDL_gamma.c in Sources */,
   1.161  				FDA6845C0DF2374E00F98A1A /* SDL_pixels.c in Sources */,
   1.162  				FDA6845E0DF2374E00F98A1A /* SDL_rect.c in Sources */,
   1.163 @@ -1331,6 +1356,12 @@
   1.164  				047677BB0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */,
   1.165  				047677BC0EA76A31008ABAF1 /* SDL_haptic.c in Sources */,
   1.166  				047AF1B30EA98D6C00811173 /* SDL_sysloadso.c in Sources */,
   1.167 +				0463873F0F0B5B7D0041FD65 /* SDL_blendline.c in Sources */,
   1.168 +				046387400F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */,
   1.169 +				046387410F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */,
   1.170 +				046387440F0B5B7D0041FD65 /* SDL_drawline.c in Sources */,
   1.171 +				046387450F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */,
   1.172 +				046387460F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */,
   1.173  			);
   1.174  			runOnlyForDeploymentPostprocessing = 0;
   1.175  		};
   1.176 @@ -1386,7 +1417,6 @@
   1.177  				FDBB64F80E159B23003B3114 /* SDL_blit_N.c in Sources */,
   1.178  				FDBB64F90E159B23003B3114 /* SDL_blit_slow.c in Sources */,
   1.179  				FDBB64FA0E159B23003B3114 /* SDL_bmp.c in Sources */,
   1.180 -				FDBB64FB0E159B23003B3114 /* SDL_fill.c in Sources */,
   1.181  				FDBB64FC0E159B23003B3114 /* SDL_gamma.c in Sources */,
   1.182  				FDBB64FD0E159B23003B3114 /* SDL_pixels.c in Sources */,
   1.183  				FDBB64FE0E159B23003B3114 /* SDL_rect.c in Sources */,
   1.184 @@ -1418,6 +1448,12 @@
   1.185  				047677BE0EA76A31008ABAF1 /* SDL_syshaptic.c in Sources */,
   1.186  				047677BF0EA76A31008ABAF1 /* SDL_haptic.c in Sources */,
   1.187  				047AF1B40EA98D6C00811173 /* SDL_sysloadso.c in Sources */,
   1.188 +				046387470F0B5B7D0041FD65 /* SDL_blendline.c in Sources */,
   1.189 +				046387480F0B5B7D0041FD65 /* SDL_blendpoint.c in Sources */,
   1.190 +				046387490F0B5B7D0041FD65 /* SDL_blendrect.c in Sources */,
   1.191 +				0463874C0F0B5B7D0041FD65 /* SDL_drawline.c in Sources */,
   1.192 +				0463874D0F0B5B7D0041FD65 /* SDL_drawpoint.c in Sources */,
   1.193 +				0463874E0F0B5B7D0041FD65 /* SDL_fillrect.c in Sources */,
   1.194  			);
   1.195  			runOnlyForDeploymentPostprocessing = 0;
   1.196  		};
     2.1 --- a/src/video/SDL_renderer_gl.c	Wed Dec 31 07:35:55 2008 +0000
     2.2 +++ b/src/video/SDL_renderer_gl.c	Wed Dec 31 07:56:56 2008 +0000
     2.3 @@ -434,36 +434,6 @@
     2.4      return renderer;
     2.5  }
     2.6  
     2.7 -static void
     2.8 -SetBlendMode(GL_RenderData * data, int blendMode)
     2.9 -{
    2.10 -    if (blendMode != data->blendMode) {
    2.11 -        switch (blendMode) {
    2.12 -        case SDL_BLENDMODE_NONE:
    2.13 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
    2.14 -            data->glDisable(GL_BLEND);
    2.15 -            break;
    2.16 -        case SDL_BLENDMODE_MASK:
    2.17 -        case SDL_BLENDMODE_BLEND:
    2.18 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.19 -            data->glEnable(GL_BLEND);
    2.20 -            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    2.21 -            break;
    2.22 -        case SDL_BLENDMODE_ADD:
    2.23 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.24 -            data->glEnable(GL_BLEND);
    2.25 -            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
    2.26 -            break;
    2.27 -        case SDL_BLENDMODE_MOD:
    2.28 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.29 -            data->glEnable(GL_BLEND);
    2.30 -            data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
    2.31 -            break;
    2.32 -        }
    2.33 -        data->blendMode = blendMode;
    2.34 -    }
    2.35 -}
    2.36 -
    2.37  static int
    2.38  GL_ActivateRenderer(SDL_Renderer * renderer)
    2.39  {
    2.40 @@ -1066,12 +1036,42 @@
    2.41      }
    2.42  }
    2.43  
    2.44 +static void
    2.45 +GL_SetBlendMode(GL_RenderData * data, int blendMode)
    2.46 +{
    2.47 +    if (blendMode != data->blendMode) {
    2.48 +        switch (blendMode) {
    2.49 +        case SDL_BLENDMODE_NONE:
    2.50 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
    2.51 +            data->glDisable(GL_BLEND);
    2.52 +            break;
    2.53 +        case SDL_BLENDMODE_MASK:
    2.54 +        case SDL_BLENDMODE_BLEND:
    2.55 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.56 +            data->glEnable(GL_BLEND);
    2.57 +            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    2.58 +            break;
    2.59 +        case SDL_BLENDMODE_ADD:
    2.60 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.61 +            data->glEnable(GL_BLEND);
    2.62 +            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
    2.63 +            break;
    2.64 +        case SDL_BLENDMODE_MOD:
    2.65 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    2.66 +            data->glEnable(GL_BLEND);
    2.67 +            data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
    2.68 +            break;
    2.69 +        }
    2.70 +        data->blendMode = blendMode;
    2.71 +    }
    2.72 +}
    2.73 +
    2.74  static int
    2.75  GL_RenderPoint(SDL_Renderer * renderer, int x, int y)
    2.76  {
    2.77      GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
    2.78  
    2.79 -    SetBlendMode(data, renderer->blendMode);
    2.80 +    GL_SetBlendMode(data, renderer->blendMode);
    2.81  
    2.82      data->glColor4f((GLfloat) renderer->r * inv255f,
    2.83                      (GLfloat) renderer->g * inv255f,
    2.84 @@ -1090,7 +1090,7 @@
    2.85  {
    2.86      GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
    2.87  
    2.88 -    SetBlendMode(data, renderer->blendMode);
    2.89 +    GL_SetBlendMode(data, renderer->blendMode);
    2.90  
    2.91      data->glColor4f((GLfloat) renderer->r * inv255f,
    2.92                      (GLfloat) renderer->g * inv255f,
    2.93 @@ -1111,11 +1111,13 @@
    2.94      GL_RenderData *data = (GL_RenderData *) renderer->driverdata;
    2.95      SDL_Window *window = SDL_GetWindowFromID(renderer->window);
    2.96  
    2.97 +    GL_SetBlendMode(data, renderer->blendMode);
    2.98 +
    2.99      data->glColor4f((GLfloat) renderer->r * inv255f,
   2.100                      (GLfloat) renderer->g * inv255f,
   2.101                      (GLfloat) renderer->b * inv255f,
   2.102                      (GLfloat) renderer->a * inv255f);
   2.103 -    SetBlendMode(data, renderer->blendMode);
   2.104 +
   2.105      data->glRecti(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
   2.106  
   2.107      return 0;
   2.108 @@ -1178,7 +1180,7 @@
   2.109          data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
   2.110      }
   2.111  
   2.112 -    SetBlendMode(data, texture->blendMode);
   2.113 +    GL_SetBlendMode(data, texture->blendMode);
   2.114  
   2.115      if (texture->scaleMode != data->scaleMode) {
   2.116          switch (texture->scaleMode) {
     3.1 --- a/src/video/SDL_renderer_gles.c	Wed Dec 31 07:35:55 2008 +0000
     3.2 +++ b/src/video/SDL_renderer_gles.c	Wed Dec 31 07:56:56 2008 +0000
     3.3 @@ -66,8 +66,10 @@
     3.4                                 SDL_Texture * texture);
     3.5  static void GLES_DirtyTexture(SDL_Renderer * renderer, SDL_Texture * texture,
     3.6                                int numrects, const SDL_Rect * rects);
     3.7 -static int GLES_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b,
     3.8 -                           Uint8 a, const SDL_Rect * rect);
     3.9 +static int GLES_RenderPoint(SDL_Renderer * renderer, int x, int y);
    3.10 +static int GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2,
    3.11 +                           int y2);
    3.12 +static int GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect);
    3.13  static int GLES_RenderCopy(SDL_Renderer * renderer, SDL_Texture * texture,
    3.14                             const SDL_Rect * srcrect,
    3.15                             const SDL_Rect * dstrect);
    3.16 @@ -226,6 +228,8 @@
    3.17      renderer->LockTexture = GLES_LockTexture;
    3.18      renderer->UnlockTexture = GLES_UnlockTexture;
    3.19      renderer->DirtyTexture = GLES_DirtyTexture;
    3.20 +    renderer->RenderPoint = GLES_RenderPoint;
    3.21 +    renderer->RenderLine = GLES_RenderLine;
    3.22      renderer->RenderFill = GLES_RenderFill;
    3.23      renderer->RenderCopy = GLES_RenderCopy;
    3.24      renderer->RenderPresent = GLES_RenderPresent;
    3.25 @@ -586,31 +590,93 @@
    3.26      }
    3.27  }
    3.28  
    3.29 +static void
    3.30 +GLES_SetBlendMode(GLES_RenderData * data, int blendMode)
    3.31 +{
    3.32 +    if (blendMode != data->blendMode) {
    3.33 +        switch (blendMode) {
    3.34 +        case SDL_BLENDMODE_NONE:
    3.35 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE);
    3.36 +            data->glDisable(GL_BLEND);
    3.37 +            break;
    3.38 +        case SDL_BLENDMODE_MASK:
    3.39 +        case SDL_BLENDMODE_BLEND:
    3.40 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    3.41 +            data->glEnable(GL_BLEND);
    3.42 +            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
    3.43 +            break;
    3.44 +        case SDL_BLENDMODE_ADD:
    3.45 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    3.46 +            data->glEnable(GL_BLEND);
    3.47 +            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
    3.48 +            break;
    3.49 +        case SDL_BLENDMODE_MOD:
    3.50 +            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
    3.51 +            data->glEnable(GL_BLEND);
    3.52 +            data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
    3.53 +            break;
    3.54 +        }
    3.55 +        data->blendMode = blendMode;
    3.56 +    }
    3.57 +}
    3.58 +
    3.59  static int
    3.60 -GLES_RenderFill(SDL_Renderer * renderer, Uint8 r, Uint8 g, Uint8 b, Uint8 a,
    3.61 -                const SDL_Rect * rect)
    3.62 +GLES_RenderPoint(SDL_Renderer * renderer, int x, int y)
    3.63  {
    3.64 +    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
    3.65  
    3.66 +    GLES_SetBlendMode(data, renderer->blendMode);
    3.67 +
    3.68 +    data->glColor4f((GLfloat) renderer->r * inv255f,
    3.69 +                    (GLfloat) renderer->g * inv255f,
    3.70 +                    (GLfloat) renderer->b * inv255f,
    3.71 +                    (GLfloat) renderer->a * inv255f);
    3.72 +
    3.73 +/* FIXME:
    3.74 +    data->glBegin(GL_POINTS);
    3.75 +    data->glVertex2i(x, y);
    3.76 +    data->glEnd();
    3.77 +*/
    3.78 +    return 0;
    3.79 +}
    3.80 +
    3.81 +static int
    3.82 +GLES_RenderLine(SDL_Renderer * renderer, int x1, int y1, int x2, int y2)
    3.83 +{
    3.84 +    GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
    3.85 +
    3.86 +    GLES_SetBlendMode(data, renderer->blendMode);
    3.87 +
    3.88 +    data->glColor4f((GLfloat) renderer->r * inv255f,
    3.89 +                    (GLfloat) renderer->g * inv255f,
    3.90 +                    (GLfloat) renderer->b * inv255f,
    3.91 +                    (GLfloat) renderer->a * inv255f);
    3.92 +
    3.93 +/* FIXME:
    3.94 +    data->glBegin(GL_LINES);
    3.95 +    data->glVertex2i(x1, y1);
    3.96 +    data->glVertex2i(x2, y2);
    3.97 +    data->glEnd();
    3.98 +*/
    3.99 +    return 0;
   3.100 +}
   3.101 +
   3.102 +static int
   3.103 +GLES_RenderFill(SDL_Renderer * renderer, const SDL_Rect * rect)
   3.104 +{
   3.105      GLES_RenderData *data = (GLES_RenderData *) renderer->driverdata;
   3.106      SDL_Window *window = SDL_GetWindowFromID(renderer->window);
   3.107  
   3.108 -    /* set proper drawing color */
   3.109 -    GLfloat oldClearColor[4];
   3.110 +    GLES_SetBlendMode(data, renderer->blendMode);
   3.111  
   3.112 -    data->glGetFloatv(GL_COLOR_CLEAR_VALUE, oldClearColor);
   3.113 +    data->glColor4f((GLfloat) renderer->r * inv255f,
   3.114 +                    (GLfloat) renderer->g * inv255f,
   3.115 +                    (GLfloat) renderer->b * inv255f,
   3.116 +                    (GLfloat) renderer->a * inv255f);
   3.117  
   3.118 -    data->glClearColor((GLclampf) r * inv255f, (GLclampf) g * inv255f,
   3.119 -                       (GLclampf) b * inv255f, (GLclampf) a * inv255f);
   3.120 -
   3.121 -    data->glScissor(rect->x, window->h - rect->y - rect->h, rect->w, rect->h);
   3.122 -    data->glEnable(GL_SCISSOR_TEST);
   3.123 -    data->glClear(GL_COLOR_BUFFER_BIT);
   3.124 -    data->glDisable(GL_SCISSOR_TEST);
   3.125 -
   3.126 -    /* reset clear color */
   3.127 -    data->glClearColor(oldClearColor[0], oldClearColor[1], oldClearColor[2],
   3.128 -                       oldClearColor[2]);
   3.129 -
   3.130 +/* FIXME:
   3.131 +    data->glRecti(rect->x, rect->y, rect->x + rect->w, rect->y + rect->h);
   3.132 +*/
   3.133      return 0;
   3.134  }
   3.135  
   3.136 @@ -677,31 +743,7 @@
   3.137          data->glColor4f(1.0f, 1.0f, 1.0f, 1.0f);
   3.138      }
   3.139  
   3.140 -    if (texture->blendMode != data->blendMode) {
   3.141 -        switch (texture->blendMode) {
   3.142 -        case SDL_BLENDMODE_NONE:
   3.143 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_DECAL);
   3.144 -            data->glDisable(GL_BLEND);
   3.145 -            break;
   3.146 -        case SDL_BLENDMODE_MASK:
   3.147 -        case SDL_BLENDMODE_BLEND:
   3.148 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   3.149 -            data->glEnable(GL_BLEND);
   3.150 -            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
   3.151 -            break;
   3.152 -        case SDL_BLENDMODE_ADD:
   3.153 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   3.154 -            data->glEnable(GL_BLEND);
   3.155 -            data->glBlendFunc(GL_SRC_ALPHA, GL_ONE);
   3.156 -            break;
   3.157 -        case SDL_BLENDMODE_MOD:
   3.158 -            data->glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
   3.159 -            data->glEnable(GL_BLEND);
   3.160 -            data->glBlendFunc(GL_ZERO, GL_SRC_COLOR);
   3.161 -            break;
   3.162 -        }
   3.163 -        data->blendMode = texture->blendMode;
   3.164 -    }
   3.165 +    GLES_SetBlendMode(data, texture->blendMode);
   3.166  
   3.167      switch (texture->scaleMode) {
   3.168      case SDL_TEXTURESCALEMODE_NONE: