Rename SDL2 tests for SDL3

.gitignore

@@ -72,12 +72,12 @@ VisualC/tests/testgamepad/axis.bmp
 VisualC/tests/testgamepad/button.bmp
 VisualC/tests/testgamepad/gamepadmap.bmp
 VisualC/tests/testgamepad/gamepadmap_back.bmp
-VisualC/tests/testoverlay2/moose.dat
+VisualC/tests/testoverlay/moose.dat
 VisualC/tests/testrendertarget/icon.bmp
 VisualC/tests/testrendertarget/sample.bmp
 VisualC/tests/testscale/icon.bmp
 VisualC/tests/testscale/sample.bmp
-VisualC/tests/testsprite2/icon.bmp
+VisualC/tests/testsprite/icon.bmp
 VisualC/tests/testyuv/testyuv.bmp
 VisualC-GDK/**/Layout
 
@@ -98,7 +98,7 @@ test/testautomation
 test/testbounds
 test/testcustomcursor
 test/testdisplayinfo
-test/testdraw2
+test/testdraw
 test/testdrawchessboard
 test/testdropfile
 test/testerror
@@ -108,7 +108,7 @@ test/testfilesystem
 test/testgamepad
 test/testgeometry
 test/testgesture
-test/testgl2
+test/testgl
 test/testgles
 test/testgles2
 test/testhaptic
@@ -126,7 +126,7 @@ test/testmessage
 test/testmouse
 test/testmultiaudio
 test/testnative
-test/testoverlay2
+test/testoverlay
 test/testplatform
 test/testpower
 test/testqsort
@@ -140,7 +140,7 @@ test/testsem
 test/testsensor
 test/testshader
 test/testshape
-test/testsprite2
+test/testsprite
 test/testspriteminimal
 test/teststreaming
 test/testsurround
@@ -150,6 +150,6 @@ test/testurl
 test/testver
 test/testviewport
 test/testvulkan
-test/testwm2
+test/testwm
 test/testyuv
 test/torturethread

VisualC-GDK/SDL.sln

@@ -6,7 +6,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{D69D5741
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3", "SDL\SDL.vcxproj", "{81CE8DAF-EBB2-4761-8E45-B71ABCCA8C68}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite", "tests\testsprite\testsprite.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
 EndProject

VisualC-GDK/tests/testgdk/testgdk.vcxproj

@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{1C9A3F71-35A5-4C56-B292-F4375B3C3649}</ProjectGuid>
-    <RootNamespace>testsprite2</RootNamespace>
+    <RootNamespace>testsprite</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -124,7 +124,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -151,7 +151,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -178,7 +178,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -205,7 +205,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -235,7 +235,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -265,7 +265,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>

VisualC-GDK/tests/testsprite/PackageLayout.xml

@@ -1,6 +1,6 @@
 <Package>
   <Chunk Id="1000" Marker="Launch">
-    <FileGroup DestinationPath="." SourcePath="." Include="testsprite2.exe" />
+    <FileGroup DestinationPath="." SourcePath="." Include="testsprite.exe" />
     <FileGroup DestinationPath="." SourcePath="." Include="MicrosoftGame.config" />
     <FileGroup DestinationPath="." SourcePath="." Include="*.bmp" />
     <FileGroup DestinationPath="." SourcePath="." Include="*.png" />

VisualC-GDK/tests/testsprite/testsprite.vcxproj

@@ -28,7 +28,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{40FB7794-D3C3-4CFE-BCF4-A80C96635682}</ProjectGuid>
-    <RootNamespace>testsprite2</RootNamespace>
+    <RootNamespace>testsprite</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -124,7 +124,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -151,7 +151,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -178,7 +178,7 @@
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -205,7 +205,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -235,7 +235,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -265,7 +265,7 @@
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -333,7 +333,7 @@ copy "%(FullPath)" "$(OutDir)\"</Command>
     </CopyFileToFolders>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testsprite2.c" />
+    <ClCompile Include="..\..\..\test\testsprite.c" />
     <ClCompile Include="..\..\..\test\testutils.c" />
   </ItemGroup>
   <ItemGroup>

VisualC-GDK/tests/testsprite/testsprite.vcxproj.filters

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testsprite2.c" />
+    <ClCompile Include="..\..\..\test\testsprite.c" />
     <ClCompile Include="..\..\..\test\testutils.c" />
   </ItemGroup>
   <ItemGroup>

VisualC-GDK/tests/testsprite/wingdk/MicrosoftGame.config

@@ -7,7 +7,7 @@
 		Publisher="CN=Publisher"/>
 
 	<ExecutableList>
-		<Executable Name="testsprite2.exe"
+		<Executable Name="testsprite.exe"
 					TargetDeviceFamily="PC"
 					Id="Game" />
 	</ExecutableList>
@@ -22,12 +22,12 @@
 	<MSAAppId>PleaseChangeMe</MSAAppId>
 	<TitleId>FFFFFFFF</TitleId>
 
-	<ShellVisuals DefaultDisplayName="testsprite2"
+	<ShellVisuals DefaultDisplayName="testsprite"
 					PublisherDisplayName="SDL"
 					Square480x480Logo="Logo480x480.png"
 					Square150x150Logo="Logo150x150.png"
 					Square44x44Logo="Logo44x44.png"
-					Description="testsprite2"
+					Description="testsprite"
 					ForegroundText="light"
 					BackgroundColor="#000000"
 					StoreLogo="Logo100x100.png"/>

VisualC-GDK/tests/testsprite/xboxone/MicrosoftGame.config

@@ -7,7 +7,7 @@
 		Publisher="CN=Publisher"/>
 
 	<ExecutableList>
-		<Executable Name="testsprite2.exe"
+		<Executable Name="testsprite.exe"
 					TargetDeviceFamily="XboxOne"
 					Id="Game" />
 	</ExecutableList>
@@ -16,13 +16,13 @@
 	<MSAAppId>PleaseChangeMe</MSAAppId>
 	<TitleId>FFFFFFFF</TitleId>
 
-	<ShellVisuals DefaultDisplayName="testsprite2"
+	<ShellVisuals DefaultDisplayName="testsprite"
 					PublisherDisplayName="SDL"
 					Square480x480Logo="Logo480x480.png"
 					Square150x150Logo="Logo150x150.png"
 					Square44x44Logo="Logo44x44.png"
 					SplashScreenImage="SplashScreenImage.png"
-					Description="testsprite2"
+					Description="testsprite"
 					ForegroundText="light"
 					BackgroundColor="#000000"
 					StoreLogo="Logo100x100.png"/>

VisualC-GDK/tests/testsprite/xboxseries/MicrosoftGame.config

@@ -7,7 +7,7 @@
 		Publisher="CN=Publisher"/>
 
 	<ExecutableList>
-		<Executable Name="testsprite2.exe"
+		<Executable Name="testsprite.exe"
 					TargetDeviceFamily="Scarlett"
 					Id="Game" />
 	</ExecutableList>
@@ -16,12 +16,12 @@
 	<MSAAppId>PleaseChangeMe</MSAAppId>
 	<TitleId>FFFFFFFF</TitleId>
 
-	<ShellVisuals DefaultDisplayName="testsprite2"
+	<ShellVisuals DefaultDisplayName="testsprite"
 					PublisherDisplayName="SDL"
 					Square480x480Logo="Logo480x480.png"
 					Square150x150Logo="Logo150x150.png"
 					Square44x44Logo="Logo44x44.png"
-					Description="testsprite2"
+					Description="testsprite"
 					SplashScreenImage="SplashScreenImage.png"
 					ForegroundText="light"
 					BackgroundColor="#000000"

VisualC-WinRT/SDL-UWP.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.33027.164
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3-UWP", "SDL-UWP.vcxproj", "{89E9B32E-A86A-47C3-A948-D2B1622925CE}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "TestDraw2", "TestDraw2\TestDraw2.vcxproj", "{95943BBE-F378-4068-A3FD-DAE1B8309B6E}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw", "testdraw\testdraw.vcxproj", "{95943BBE-F378-4068-A3FD-DAE1B8309B6E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

VisualC-WinRT/testdraw/Package.appxmanifest

@@ -14,7 +14,7 @@
   <mp:PhoneIdentity PhoneProductId="a430d85b-5cf1-4705-9fe1-7da520f91d4b" PhonePublisherId="00000000-0000-0000-0000-000000000000"/>
 
   <Properties>
-    <DisplayName>TestDraw2</DisplayName>
+    <DisplayName>testdraw</DisplayName>
     <PublisherDisplayName>Daniel</PublisherDisplayName>
     <Logo>Assets\StoreLogo.png</Logo>
   </Properties>
@@ -30,12 +30,12 @@
   <Applications>
     <Application Id="App"
       Executable="$targetnametoken$.exe"
-      EntryPoint="TestDraw2.App">
+      EntryPoint="testdraw.App">
       <uap:VisualElements
-        DisplayName="TestDraw2"
+        DisplayName="testdraw"
         Square150x150Logo="Assets\Square150x150Logo.png"
         Square44x44Logo="Assets\Square44x44Logo.png"
-        Description="TestDraw2"
+        Description="testdraw"
         BackgroundColor="transparent">
         <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"/>
         <uap:SplashScreen Image="Assets\SplashScreen.png" />

VisualC-WinRT/testdraw/testdraw.vcxproj

@@ -37,7 +37,7 @@
   <PropertyGroup Label="Globals">
     <ProjectGuid>{95943bbe-f378-4068-a3fd-dae1b8309b6e}</ProjectGuid>
     <Keyword>DirectXApp</Keyword>
-    <RootNamespace>TestDraw2</RootNamespace>
+    <RootNamespace>testdraw</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
     <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
     <AppContainerApplication>true</AppContainerApplication>
@@ -310,7 +310,7 @@
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">true</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</CompileAsWinRT>
     </ClCompile>
-    <ClCompile Include="..\..\test\testdraw2.c">
+    <ClCompile Include="..\..\test\testdraw.c">
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">false</CompileAsWinRT>
       <CompileAsWinRT Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">false</CompileAsWinRT>

VisualC-WinRT/testdraw/testdraw.vcxproj.filters

@@ -42,7 +42,7 @@
     <ClCompile Include="..\..\test\main.cpp">
       <Filter>Content</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\test\testdraw2.c">
+    <ClCompile Include="..\..\test\testdraw.c">
       <Filter>Content</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\test\SDL_test_assert.c">

VisualC/SDL.sln

@@ -12,15 +12,15 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testatomic", "tests\testato
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testautomation", "tests\testautomation\testautomation.vcxproj", "{9C7E8C03-3130-436D-A97E-E8F8ED1AC4EA}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw2", "tests\testdraw2\testdraw2.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testdraw", "tests\testdraw\testdraw.vcxproj", "{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testfile", "tests\testfile\testfile.vcxproj", "{CAE4F1D0-314F-4B10-805B-0EFD670133A0}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl2", "tests\testgl2\testgl2.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testgl", "tests\testgl\testgl.vcxproj", "{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testjoystick", "tests\testjoystick\testjoystick.vcxproj", "{55812185-D13C-4022-9C81-32E0F4A08304}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testoverlay2", "tests\testoverlay2\testoverlay2.vcxproj", "{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testoverlay", "tests\testoverlay\testoverlay.vcxproj", "{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testplatform", "tests\testplatform\testplatform.vcxproj", "{26932B24-EFC6-4E3A-B277-ED653DA37968}"
 EndProject
@@ -34,7 +34,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testscale", "tests\testscal
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testshape", "tests\testshape\testshape.vcxproj", "{31A3E4E1-AAE9-4EF3-9B23-18D0924BE4D2}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite2", "tests\testsprite2\testsprite2.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsprite", "tests\testsprite\testsprite.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C96635682}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDL3_test", "SDL_test\SDL_test.vcxproj", "{DA956FD3-E143-46F2-9FE5-C77BEBC56B1A}"
 EndProject
@@ -46,7 +46,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "gamepadmap", "tests\gamepad
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testvulkan", "tests\testvulkan\testvulkan.vcxproj", "{0D604DFD-AAB6-442C-9368-F91A344146AB}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testwm2", "tests\testwm2\testwm2.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A5}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testwm", "tests\testwm\testwm.vcxproj", "{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A5}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testyuv", "tests\testyuv\testyuv.vcxproj", "{40FB7794-D3C3-4CFE-BCF4-A80C97635682}"
 EndProject

VisualC/tests/testdraw/testdraw.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8682FE1E-0CF6-4EDD-9BB5-1733D8C8B4DF}</ProjectGuid>
-    <RootNamespace>testdraw2</RootNamespace>
+    <RootNamespace>testdraw</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,7 +89,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/testdraw2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testdraw.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -112,7 +112,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/testdraw2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testdraw.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -135,7 +135,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testdraw2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testdraw.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -161,7 +161,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testdraw2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testdraw.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -196,7 +196,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testdraw2.c" />
+    <ClCompile Include="..\..\..\test\testdraw.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VisualC/tests/testgl/testgl.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{8B5CFB38-CCBA-40A8-AD7A-89C57B070884}</ProjectGuid>
-    <RootNamespace>testgl2</RootNamespace>
+    <RootNamespace>testgl</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,7 +89,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testgl2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testgl.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -116,7 +116,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testgl2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testgl.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -143,7 +143,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/testgl2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testgl.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -167,7 +167,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/testgl2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testgl.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -200,7 +200,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testgl2.c" />
+    <ClCompile Include="..\..\..\test\testgl.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

VisualC/tests/testoverlay/testoverlay.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{B51E0D74-F0A2-45A2-BD2A-8B7D95B8204A}</ProjectGuid>
-    <RootNamespace>testoverlay2</RootNamespace>
+    <RootNamespace>testoverlay</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,7 +89,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/testoverlay2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testoverlay.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -112,7 +112,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/testoverlay2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testoverlay.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -135,7 +135,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testoverlay2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testoverlay.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -161,7 +161,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testoverlay2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testoverlay.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -216,7 +216,7 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testoverlay2.c" />
+    <ClCompile Include="..\..\..\test\testoverlay.c" />
     <ClCompile Include="..\..\..\test\testutils.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

VisualC/tests/testsprite/testsprite.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{40FB7794-D3C3-4CFE-BCF4-A80C96635682}</ProjectGuid>
-    <RootNamespace>testsprite2</RootNamespace>
+    <RootNamespace>testsprite</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,7 +89,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -112,7 +112,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -135,7 +135,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -161,7 +161,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testsprite2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testsprite.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -216,7 +216,7 @@
     </CustomBuild>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testsprite2.c" />
+    <ClCompile Include="..\..\..\test\testsprite.c" />
     <ClCompile Include="..\..\..\test\testutils.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />

VisualC/tests/testwm/testwm.vcxproj

@@ -20,7 +20,7 @@
   </ItemGroup>
   <PropertyGroup Label="Globals">
     <ProjectGuid>{C4E04D18-EF76-4B42-B4C2-16A1BACDC0A5}</ProjectGuid>
-    <RootNamespace>testwm2</RootNamespace>
+    <RootNamespace>testwm</RootNamespace>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
@@ -89,7 +89,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testwm2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testwm.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -115,7 +115,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Debug/testwm2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Debug/testwm.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <Optimization>Disabled</Optimization>
@@ -141,7 +141,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>Win32</TargetEnvironment>
-      <TypeLibraryName>.\Release/testwm2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testwm.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -164,7 +164,7 @@
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <TargetEnvironment>X64</TargetEnvironment>
-      <TypeLibraryName>.\Release/testwm2.tlb</TypeLibraryName>
+      <TypeLibraryName>.\Release/testwm.tlb</TypeLibraryName>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>$(SolutionDir)/../include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
@@ -196,7 +196,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <ClCompile Include="..\..\..\test\testwm2.c" />
+    <ClCompile Include="..\..\..\test\testwm.c" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">

Xcode/SDLTest/SDLTest.xcodeproj/project.pbxproj

@@ -64,9 +64,9 @@
 /* Begin PBXBuildFile section */
 		001795901074216E00F5D044 /* testatomic.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017958F1074216E00F5D044 /* testatomic.c */; };
 		001795B11074222D00F5D044 /* testaudioinfo.c in Sources */ = {isa = PBXBuildFile; fileRef = 001795B01074222D00F5D044 /* testaudioinfo.c */; };
-		0017972810742FB900F5D044 /* testgl2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017972710742FB900F5D044 /* testgl2.c */; };
+		0017972810742FB900F5D044 /* testgl.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017972710742FB900F5D044 /* testgl.c */; };
 		0017974F1074315700F5D044 /* testhaptic.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017974E1074315700F5D044 /* testhaptic.c */; };
-		001797721074320D00F5D044 /* testdraw2.c in Sources */ = {isa = PBXBuildFile; fileRef = 001797711074320D00F5D044 /* testdraw2.c */; };
+		001797721074320D00F5D044 /* testdraw.c in Sources */ = {isa = PBXBuildFile; fileRef = 001797711074320D00F5D044 /* testdraw.c */; };
 		00179792107432FA00F5D044 /* testime.c in Sources */ = {isa = PBXBuildFile; fileRef = 00179791107432FA00F5D044 /* testime.c */; };
 		001797B41074339C00F5D044 /* testintersections.c in Sources */ = {isa = PBXBuildFile; fileRef = 001797B31074339C00F5D044 /* testintersections.c */; };
 		001797D41074343E00F5D044 /* testloadso.c in Sources */ = {isa = PBXBuildFile; fileRef = 001797D31074343E00F5D044 /* testloadso.c */; };
@@ -75,11 +75,11 @@
 		001798801074392D00F5D044 /* testnativecocoa.m in Sources */ = {isa = PBXBuildFile; fileRef = 0017985C107436ED00F5D044 /* testnativecocoa.m */; };
 		001798BA10743A4900F5D044 /* testpower.c in Sources */ = {isa = PBXBuildFile; fileRef = 001798B910743A4900F5D044 /* testpower.c */; };
 		001798FA10743E9200F5D044 /* testresample.c in Sources */ = {isa = PBXBuildFile; fileRef = 001798F910743E9200F5D044 /* testresample.c */; };
-		0017991A10743F5300F5D044 /* testsprite2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017991910743F5300F5D044 /* testsprite2.c */; };
+		0017991A10743F5300F5D044 /* testsprite.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017991910743F5300F5D044 /* testsprite.c */; };
-		0017993C10743FEF00F5D044 /* testwm2.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017993B10743FEF00F5D044 /* testwm2.c */; };
+		0017993C10743FEF00F5D044 /* testwm.c in Sources */ = {isa = PBXBuildFile; fileRef = 0017993B10743FEF00F5D044 /* testwm.c */; };
 		002F341809CA1C5B00EBEB88 /* testfile.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F341709CA1C5B00EBEB88 /* testfile.c */; };
 		002F343709CA1F6F00EBEB88 /* testiconv.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F343609CA1F6F00EBEB88 /* testiconv.c */; };
-		002F345409CA202000EBEB88 /* testoverlay2.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F345209CA201C00EBEB88 /* testoverlay2.c */; };
+		002F345409CA202000EBEB88 /* testoverlay.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F345209CA201C00EBEB88 /* testoverlay.c */; };
 		002F347009CA20A600EBEB88 /* testplatform.c in Sources */ = {isa = PBXBuildFile; fileRef = 002F346F09CA20A600EBEB88 /* testplatform.c */; };
 		00794E6609D20865003FC8A1 /* sample.wav in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6209D20839003FC8A1 /* sample.wav */; };
 		00794EF009D23739003FC8A1 /* utf8.txt in CopyFiles */ = {isa = PBXBuildFile; fileRef = 00794E6309D20839003FC8A1 /* utf8.txt */; };
@@ -214,7 +214,7 @@
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 00179756107431B300F5D044;
-			remoteInfo = testdraw2;
+			remoteInfo = testdraw;
 		};
 		0017995D1074403E00F5D044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -235,7 +235,7 @@
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 0017970910742F3200F5D044;
-			remoteInfo = testgl2;
+			remoteInfo = testgl;
 		};
 		001799671074403E00F5D044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -319,7 +319,7 @@
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 002F343C09CA1FB300EBEB88;
-			remoteInfo = testoverlay2;
+			remoteInfo = testoverlay;
 		};
 		001799871074403E00F5D044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -354,7 +354,7 @@
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 001798FE10743F1000F5D044;
-			remoteInfo = testsprite2;
+			remoteInfo = testsprite;
 		};
 		001799931074403E00F5D044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -375,7 +375,7 @@
 			containerPortal = 08FB7793FE84155DC02AAC07 /* Project object */;
 			proxyType = 1;
 			remoteGlobalIDString = 0017992010743FB700F5D044;
-			remoteInfo = testwm2;
+			remoteInfo = testwm;
 		};
 		001799A11074403E00F5D044 /* PBXContainerItemProxy */ = {
 			isa = PBXContainerItemProxy;
@@ -678,12 +678,12 @@
 		0017958F1074216E00F5D044 /* testatomic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testatomic.c; sourceTree = "<group>"; };
 		001795AD107421BF00F5D044 /* testaudioinfo */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testaudioinfo; path = testaudioinfo.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		001795B01074222D00F5D044 /* testaudioinfo.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testaudioinfo.c; sourceTree = "<group>"; };
-		0017972110742F3200F5D044 /* testgl2.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testgl2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0017972110742F3200F5D044 /* testgl.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = testgl.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		0017972710742FB900F5D044 /* testgl2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testgl2.c; sourceTree = "<group>"; };
+		0017972710742FB900F5D044 /* testgl.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testgl.c; sourceTree = "<group>"; };
 		00179748107430D600F5D044 /* testhaptic */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testhaptic; path = testhaptic.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		0017974E1074315700F5D044 /* testhaptic.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testhaptic.c; sourceTree = "<group>"; };
-		0017976E107431B300F5D044 /* testdraw2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testdraw2; path = testdraw2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0017976E107431B300F5D044 /* testdraw */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testdraw; path = testdraw.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		001797711074320D00F5D044 /* testdraw2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testdraw2.c; sourceTree = "<group>"; };
+		001797711074320D00F5D044 /* testdraw.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testdraw.c; sourceTree = "<group>"; };
 		0017978E107432AE00F5D044 /* testime */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testime; path = testime.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		00179791107432FA00F5D044 /* testime.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testime.c; sourceTree = "<group>"; };
 		001797AE1074334C00F5D044 /* testintersections */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testintersections; path = testintersections.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -701,16 +701,16 @@
 		001798B910743A4900F5D044 /* testpower.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testpower.c; sourceTree = "<group>"; };
 		001798F210743BEC00F5D044 /* testresample */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testresample; path = testresample.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		001798F910743E9200F5D044 /* testresample.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testresample.c; sourceTree = "<group>"; };
-		0017991610743F1000F5D044 /* testsprite2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testsprite2; path = testsprite2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0017991610743F1000F5D044 /* testsprite */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testsprite; path = testsprite.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		0017991910743F5300F5D044 /* testsprite2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testsprite2.c; sourceTree = "<group>"; };
+		0017991910743F5300F5D044 /* testsprite.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testsprite.c; sourceTree = "<group>"; };
-		0017993810743FB700F5D044 /* testwm2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testwm2; path = testwm2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		0017993810743FB700F5D044 /* testwm */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testwm; path = testwm.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		0017993B10743FEF00F5D044 /* testwm2.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testwm2.c; sourceTree = "<group>"; };
+		0017993B10743FEF00F5D044 /* testwm.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = testwm.c; sourceTree = "<group>"; };
 		002F341209CA1BFF00EBEB88 /* testfile */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testfile; path = testfile.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		002F341709CA1C5B00EBEB88 /* testfile.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testfile.c; sourceTree = "<group>"; };
 		002F343109CA1F0300EBEB88 /* testiconv */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testiconv; path = testiconv.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		002F343609CA1F6F00EBEB88 /* testiconv.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testiconv.c; sourceTree = "<group>"; };
-		002F344D09CA1FB300EBEB88 /* testoverlay2 */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testoverlay2; path = testoverlay2.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		002F344D09CA1FB300EBEB88 /* testoverlay */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testoverlay; path = testoverlay.app; sourceTree = BUILT_PRODUCTS_DIR; };
-		002F345209CA201C00EBEB88 /* testoverlay2.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testoverlay2.c; sourceTree = "<group>"; };
+		002F345209CA201C00EBEB88 /* testoverlay.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testoverlay.c; sourceTree = "<group>"; };
 		002F346A09CA204F00EBEB88 /* testplatform */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; name = testplatform; path = testplatform.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		002F346F09CA20A600EBEB88 /* testplatform.c */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.c; path = testplatform.c; sourceTree = "<group>"; };
 		003FA63A093FFD41000C53B3 /* SDL.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = SDL.xcodeproj; path = ../SDL/SDL.xcodeproj; sourceTree = SOURCE_ROOT; };
@@ -1212,7 +1212,7 @@
 				083E4872006D84C97F000001 /* loopwave.c */,
 				0017958F1074216E00F5D044 /* testatomic.c */,
 				001795B01074222D00F5D044 /* testaudioinfo.c */,
-				001797711074320D00F5D044 /* testdraw2.c */,
+				001797711074320D00F5D044 /* testdraw.c */,
 				DB0F48D717CA51D2008798C5 /* testdrawchessboard.c */,
 				DB445EFA18184BB600B306B0 /* testdropfile.c */,
 				083E4878006D85357F000001 /* testerror.c */,
@@ -1220,7 +1220,7 @@
 				DB0F48D817CA51D2008798C5 /* testfilesystem.c */,
 				BBFC088E164C6820003E6A99 /* testgamepad.c */,
 				F3C17CD628E416AC00E1A26D /* testgeometry.c */,
-				0017972710742FB900F5D044 /* testgl2.c */,
+				0017972710742FB900F5D044 /* testgl.c */,
 				DB166CBC16A1C74100A1396C /* testgles.c */,
 				0017974E1074315700F5D044 /* testhaptic.c */,
 				DB89958318A19B130092407C /* testhotplug.c */,
@@ -1237,7 +1237,7 @@
 				0017985B107436ED00F5D044 /* testnative.h */,
 				0017985C107436ED00F5D044 /* testnativecocoa.m */,
 				00179872107438D000F5D044 /* testnativex11.c */,
-				002F345209CA201C00EBEB88 /* testoverlay2.c */,
+				002F345209CA201C00EBEB88 /* testoverlay.c */,
 				002F346F09CA20A600EBEB88 /* testplatform.c */,
 				001798B910743A4900F5D044 /* testpower.c */,
 				DB166CBF16A1C74100A1396C /* testrelative.c */,
@@ -1249,14 +1249,14 @@
 				083E487E006D86A17F000001 /* testsem.c */,
 				DB166CC416A1C74100A1396C /* testshader.c */,
 				453774A4120915E3002F0F45 /* testshape.c */,
-				0017991910743F5300F5D044 /* testsprite2.c */,
+				0017991910743F5300F5D044 /* testsprite.c */,
 				DB166CC516A1C74100A1396C /* testspriteminimal.c */,
 				DB166CC616A1C74100A1396C /* teststreaming.c */,
 				092D6D58FFB311A97F000001 /* testthread.c */,
 				083E4880006D86A17F000001 /* testtimer.c */,
 				F3C17C7328E40ADE00E1A26D /* testutils.c */,
 				083E4882006D86A17F000001 /* testver.c */,
-				0017993B10743FEF00F5D044 /* testwm2.c */,
+				0017993B10743FEF00F5D044 /* testwm.c */,
 				66E88E8A203B778F0004D44E /* testyuv_cvt.c */,
 				083E4887006D86A17F000001 /* torturethread.c */,
 			);
@@ -1280,13 +1280,13 @@
 				BEC567F50761D90600A33029 /* torturethread */,
 				002F341209CA1BFF00EBEB88 /* testfile */,
 				002F343109CA1F0300EBEB88 /* testiconv */,
-				002F344D09CA1FB300EBEB88 /* testoverlay2 */,
+				002F344D09CA1FB300EBEB88 /* testoverlay */,
 				002F346A09CA204F00EBEB88 /* testplatform */,
 				0017958C10741F7900F5D044 /* testatomic */,
 				001795AD107421BF00F5D044 /* testaudioinfo */,
-				0017972110742F3200F5D044 /* testgl2.app */,
+				0017972110742F3200F5D044 /* testgl.app */,
 				00179748107430D600F5D044 /* testhaptic */,
-				0017976E107431B300F5D044 /* testdraw2 */,
+				0017976E107431B300F5D044 /* testdraw */,
 				0017978E107432AE00F5D044 /* testime */,
 				001797AE1074334C00F5D044 /* testintersections */,
 				001797D0107433C600F5D044 /* testloadso */,
@@ -1294,8 +1294,8 @@
 				001798941074392D00F5D044 /* testnative.app */,
 				001798B5107439DF00F5D044 /* testpower */,
 				001798F210743BEC00F5D044 /* testresample */,
-				0017991610743F1000F5D044 /* testsprite2 */,
+				0017991610743F1000F5D044 /* testsprite */,
-				0017993810743FB700F5D044 /* testwm2 */,
+				0017993810743FB700F5D044 /* testwm */,
 				4537749212091504002F0F45 /* testshape */,
 				BBFC08CD164C6862003E6A99 /* testgamepad */,
 				DB166D7F16A1D12400A1396C /* libSDL_test.a */,
@@ -1387,9 +1387,9 @@
 			productReference = 001795AD107421BF00F5D044 /* testaudioinfo */;
 			productType = "com.apple.product-type.application";
 		};
-		0017970910742F3200F5D044 /* testgl2 */ = {
+		0017970910742F3200F5D044 /* testgl */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0017971B10742F3200F5D044 /* Build configuration list for PBXNativeTarget "testgl2" */;
+			buildConfigurationList = 0017971B10742F3200F5D044 /* Build configuration list for PBXNativeTarget "testgl" */;
 			buildPhases = (
 				0017970E10742F3200F5D044 /* Sources */,
 				0017970F10742F3200F5D044 /* Frameworks */,
@@ -1398,9 +1398,9 @@
 			);
 			dependencies = (
 			);
-			name = testgl2;
+			name = testgl;
 			productName = testalpha;
-			productReference = 0017972110742F3200F5D044 /* testgl2.app */;
+			productReference = 0017972110742F3200F5D044 /* testgl.app */;
 			productType = "com.apple.product-type.application";
 		};
 		00179730107430D600F5D044 /* testhaptic */ = {
@@ -1419,9 +1419,9 @@
 			productReference = 00179748107430D600F5D044 /* testhaptic */;
 			productType = "com.apple.product-type.application";
 		};
-		00179756107431B300F5D044 /* testdraw2 */ = {
+		00179756107431B300F5D044 /* testdraw */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 00179768107431B300F5D044 /* Build configuration list for PBXNativeTarget "testdraw2" */;
+			buildConfigurationList = 00179768107431B300F5D044 /* Build configuration list for PBXNativeTarget "testdraw" */;
 			buildPhases = (
 				0017975B107431B300F5D044 /* Sources */,
 				0017975C107431B300F5D044 /* Frameworks */,
@@ -1430,9 +1430,9 @@
 			);
 			dependencies = (
 			);
-			name = testdraw2;
+			name = testdraw;
 			productName = testalpha;
-			productReference = 0017976E107431B300F5D044 /* testdraw2 */;
+			productReference = 0017976E107431B300F5D044 /* testdraw */;
 			productType = "com.apple.product-type.application";
 		};
 		00179776107432AE00F5D044 /* testime */ = {
@@ -1549,9 +1549,9 @@
 			productReference = 001798F210743BEC00F5D044 /* testresample */;
 			productType = "com.apple.product-type.application";
 		};
-		001798FE10743F1000F5D044 /* testsprite2 */ = {
+		001798FE10743F1000F5D044 /* testsprite */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0017991010743F1000F5D044 /* Build configuration list for PBXNativeTarget "testsprite2" */;
+			buildConfigurationList = 0017991010743F1000F5D044 /* Build configuration list for PBXNativeTarget "testsprite" */;
 			buildPhases = (
 				0017990310743F1000F5D044 /* Sources */,
 				0017990410743F1000F5D044 /* Frameworks */,
@@ -1561,14 +1561,14 @@
 			);
 			dependencies = (
 			);
-			name = testsprite2;
+			name = testsprite;
 			productName = testalpha;
-			productReference = 0017991610743F1000F5D044 /* testsprite2 */;
+			productReference = 0017991610743F1000F5D044 /* testsprite */;
 			productType = "com.apple.product-type.application";
 		};
-		0017992010743FB700F5D044 /* testwm2 */ = {
+		0017992010743FB700F5D044 /* testwm */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 0017993210743FB700F5D044 /* Build configuration list for PBXNativeTarget "testwm2" */;
+			buildConfigurationList = 0017993210743FB700F5D044 /* Build configuration list for PBXNativeTarget "testwm" */;
 			buildPhases = (
 				0017992510743FB700F5D044 /* Sources */,
 				0017992610743FB700F5D044 /* Frameworks */,
@@ -1577,9 +1577,9 @@
 			);
 			dependencies = (
 			);
-			name = testwm2;
+			name = testwm;
 			productName = testalpha;
-			productReference = 0017993810743FB700F5D044 /* testwm2 */;
+			productReference = 0017993810743FB700F5D044 /* testwm */;
 			productType = "com.apple.product-type.application";
 		};
 		002F340109CA1BFF00EBEB88 /* testfile */ = {
@@ -1615,9 +1615,9 @@
 			productReference = 002F343109CA1F0300EBEB88 /* testiconv */;
 			productType = "com.apple.product-type.application";
 		};
-		002F343C09CA1FB300EBEB88 /* testoverlay2 */ = {
+		002F343C09CA1FB300EBEB88 /* testoverlay */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 002F344909CA1FB300EBEB88 /* Build configuration list for PBXNativeTarget "testoverlay2" */;
+			buildConfigurationList = 002F344909CA1FB300EBEB88 /* Build configuration list for PBXNativeTarget "testoverlay" */;
 			buildPhases = (
 				002F344209CA1FB300EBEB88 /* Sources */,
 				002F344309CA1FB300EBEB88 /* Frameworks */,
@@ -1627,9 +1627,9 @@
 			);
 			dependencies = (
 			);
-			name = testoverlay2;
+			name = testoverlay;
 			productName = testalpha;
-			productReference = 002F344D09CA1FB300EBEB88 /* testoverlay2 */;
+			productReference = 002F344D09CA1FB300EBEB88 /* testoverlay */;
 			productType = "com.apple.product-type.application";
 		};
 		002F345909CA204F00EBEB88 /* testplatform */ = {
@@ -2165,7 +2165,7 @@
 				BEC566C50761D90300A33029 /* loopwave */,
 				0017957410741F7900F5D044 /* testatomic */,
 				00179595107421BF00F5D044 /* testaudioinfo */,
-				00179756107431B300F5D044 /* testdraw2 */,
+				00179756107431B300F5D044 /* testdraw */,
 				DB0F48D917CA51E5008798C5 /* testdrawchessboard */,
 				DB445EE618184B7000B306B0 /* testdropfile */,
 				BEC566FB0761D90300A33029 /* testerror */,
@@ -2173,7 +2173,7 @@
 				DB0F48EF17CA5212008798C5 /* testfilesystem */,
 				BBFC08B7164C6862003E6A99 /* testgamepad */,
 				F3C17CDB28E416CF00E1A26D /* testgeometry */,
-				0017970910742F3200F5D044 /* testgl2 */,
+				0017970910742F3200F5D044 /* testgl */,
 				00179730107430D600F5D044 /* testhaptic */,
 				DB89956D18A19ABA0092407C /* testhotplug */,
 				002F342009CA1F0300EBEB88 /* testiconv */,
@@ -2186,7 +2186,7 @@
 				DB166DC416A1D36A00A1396C /* testmessage */,
 				001797FA1074355200F5D044 /* testmultiaudio */,
 				001798781074392D00F5D044 /* testnative */,
-				002F343C09CA1FB300EBEB88 /* testoverlay2 */,
+				002F343C09CA1FB300EBEB88 /* testoverlay */,
 				002F345909CA204F00EBEB88 /* testplatform */,
 				0017989D107439DF00F5D044 /* testpower */,
 				DB166DDC16A1D50C00A1396C /* testrelative */,
@@ -2198,13 +2198,13 @@
 				BEC567720761D90500A33029 /* testsem */,
 				DB166E5716A1D6F300A1396C /* testshader */,
 				4537749112091504002F0F45 /* testshape */,
-				001798FE10743F1000F5D044 /* testsprite2 */,
+				001798FE10743F1000F5D044 /* testsprite */,
 				DB166E6D16A1D78400A1396C /* testspriteminimal */,
 				DB166E8016A1D78C00A1396C /* teststreaming */,
 				BEC567230761D90400A33029 /* testthread */,
 				BEC5678D0761D90500A33029 /* testtimer */,
 				BEC567A70761D90500A33029 /* testversion */,
-				0017992010743FB700F5D044 /* testwm2 */,
+				0017992010743FB700F5D044 /* testwm */,
 				BEC567EA0761D90600A33029 /* torturethread */,
 			);
 		};
@@ -2341,7 +2341,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0017972810742FB900F5D044 /* testgl2.c in Sources */,
+				0017972810742FB900F5D044 /* testgl.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2357,7 +2357,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				001797721074320D00F5D044 /* testdraw2.c in Sources */,
+				001797721074320D00F5D044 /* testdraw.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2425,7 +2425,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0017991A10743F5300F5D044 /* testsprite2.c in Sources */,
+				0017991A10743F5300F5D044 /* testsprite.c in Sources */,
 				F3C17C8328E4124400E1A26D /* testutils.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -2434,7 +2434,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				0017993C10743FEF00F5D044 /* testwm2.c in Sources */,
+				0017993C10743FEF00F5D044 /* testwm.c in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -2459,7 +2459,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				002F345409CA202000EBEB88 /* testoverlay2.c in Sources */,
+				002F345409CA202000EBEB88 /* testoverlay.c in Sources */,
 				66E88E8B203B778F0004D44E /* testyuv_cvt.c in Sources */,
 				F3C17C7F28E4101000E1A26D /* testutils.c in Sources */,
 			);
@@ -2754,7 +2754,7 @@
 		};
 		0017995A1074403E00F5D044 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 00179756107431B300F5D044 /* testdraw2 */;
+			target = 00179756107431B300F5D044 /* testdraw */;
 			targetProxy = 001799591074403E00F5D044 /* PBXContainerItemProxy */;
 		};
 		0017995E1074403E00F5D044 /* PBXTargetDependency */ = {
@@ -2769,7 +2769,7 @@
 		};
 		001799661074403E00F5D044 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 0017970910742F3200F5D044 /* testgl2 */;
+			target = 0017970910742F3200F5D044 /* testgl */;
 			targetProxy = 001799651074403E00F5D044 /* PBXContainerItemProxy */;
 		};
 		001799681074403E00F5D044 /* PBXTargetDependency */ = {
@@ -2829,7 +2829,7 @@
 		};
 		001799841074403E00F5D044 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 002F343C09CA1FB300EBEB88 /* testoverlay2 */;
+			target = 002F343C09CA1FB300EBEB88 /* testoverlay */;
 			targetProxy = 001799831074403E00F5D044 /* PBXContainerItemProxy */;
 		};
 		001799881074403E00F5D044 /* PBXTargetDependency */ = {
@@ -2854,7 +2854,7 @@
 		};
 		001799921074403E00F5D044 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 001798FE10743F1000F5D044 /* testsprite2 */;
+			target = 001798FE10743F1000F5D044 /* testsprite */;
 			targetProxy = 001799911074403E00F5D044 /* PBXContainerItemProxy */;
 		};
 		001799941074403E00F5D044 /* PBXTargetDependency */ = {
@@ -2869,7 +2869,7 @@
 		};
 		0017999E1074403E00F5D044 /* PBXTargetDependency */ = {
 			isa = PBXTargetDependency;
-			target = 0017992010743FB700F5D044 /* testwm2 */;
+			target = 0017992010743FB700F5D044 /* testwm */;
 			targetProxy = 0017999D1074403E00F5D044 /* PBXContainerItemProxy */;
 		};
 		001799A21074403E00F5D044 /* PBXTargetDependency */ = {
@@ -2977,7 +2977,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_OPENGL;
-				PRODUCT_NAME = testgl2;
+				PRODUCT_NAME = testgl;
 				SUPPORTED_PLATFORMS = macosx;
 			};
 			name = Debug;
@@ -2986,7 +2986,7 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				GCC_PREPROCESSOR_DEFINITIONS = HAVE_OPENGL;
-				PRODUCT_NAME = testgl2;
+				PRODUCT_NAME = testgl;
 				SUPPORTED_PLATFORMS = macosx;
 			};
 			name = Release;
@@ -3008,14 +3008,14 @@
 		0017976B107431B300F5D044 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testdraw2;
+				PRODUCT_NAME = testdraw;
 			};
 			name = Debug;
 		};
 		0017976C107431B300F5D044 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testdraw2;
+				PRODUCT_NAME = testdraw;
 			};
 			name = Release;
 		};
@@ -3122,28 +3122,28 @@
 		0017991310743F1000F5D044 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testsprite2;
+				PRODUCT_NAME = testsprite;
 			};
 			name = Debug;
 		};
 		0017991410743F1000F5D044 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testsprite2;
+				PRODUCT_NAME = testsprite;
 			};
 			name = Release;
 		};
 		0017993510743FB700F5D044 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testwm2;
+				PRODUCT_NAME = testwm;
 			};
 			name = Debug;
 		};
 		0017993610743FB700F5D044 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testwm2;
+				PRODUCT_NAME = testwm;
 			};
 			name = Release;
 		};
@@ -3241,7 +3241,7 @@
 		002A85C51073008E007319AE /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testoverlay2;
+				PRODUCT_NAME = testoverlay;
 			};
 			name = Debug;
 		};
@@ -3378,7 +3378,7 @@
 		002A85E71073009D007319AE /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				PRODUCT_NAME = testoverlay2;
+				PRODUCT_NAME = testoverlay;
 			};
 			name = Release;
 		};
@@ -3707,7 +3707,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		0017971B10742F3200F5D044 /* Build configuration list for PBXNativeTarget "testgl2" */ = {
+		0017971B10742F3200F5D044 /* Build configuration list for PBXNativeTarget "testgl" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0017971E10742F3200F5D044 /* Debug */,
@@ -3725,7 +3725,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		00179768107431B300F5D044 /* Build configuration list for PBXNativeTarget "testdraw2" */ = {
+		00179768107431B300F5D044 /* Build configuration list for PBXNativeTarget "testdraw" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0017976B107431B300F5D044 /* Debug */,
@@ -3797,7 +3797,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		0017991010743F1000F5D044 /* Build configuration list for PBXNativeTarget "testsprite2" */ = {
+		0017991010743F1000F5D044 /* Build configuration list for PBXNativeTarget "testsprite" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0017991310743F1000F5D044 /* Debug */,
@@ -3806,7 +3806,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		0017993210743FB700F5D044 /* Build configuration list for PBXNativeTarget "testwm2" */ = {
+		0017993210743FB700F5D044 /* Build configuration list for PBXNativeTarget "testwm" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				0017993510743FB700F5D044 /* Debug */,
@@ -3950,7 +3950,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Debug;
 		};
-		002F344909CA1FB300EBEB88 /* Build configuration list for PBXNativeTarget "testoverlay2" */ = {
+		002F344909CA1FB300EBEB88 /* Build configuration list for PBXNativeTarget "testoverlay" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				002A85C51073008E007319AE /* Debug */,

docs/README-emscripten.md

@@ -59,7 +59,7 @@ Or with cmake:
 To build one of the tests:
 
     $ cd test/
-    $ emcc -O2 --js-opts 0 -g4 testdraw2.c -I../include ../build/.libs/libSDL3.a ../build/libSDL3_test.a -o a.html
+    $ emcc -O2 --js-opts 0 -g4 testdraw.c -I../include ../build/.libs/libSDL3.a ../build/libSDL3_test.a -o a.html
 
 Uses GLES2 renderer or software
 

docs/README-gdk.md

@@ -40,7 +40,7 @@ The included `VisualC-GDK/SDL.sln` solution includes the following targets for t
 * tests/testgamecontroller - Standard SDL test program demonstrating controller functionality.
 * tests/testgdk - GDK-specific test program that demonstrates using the global task queue to login a user into Xbox Live.
   *NOTE*: As of the June 2022 GDK, you cannot test user logins without a valid Title ID and MSAAppId. You will need to manually change the identifiers in the `MicrosoftGame.config` to your valid IDs from Partner Center if you wish to test this.
-* tests/testsprite2 - Standard SDL test program demonstrating sprite drawing functionality.
+* tests/testsprite - Standard SDL test program demonstrating sprite drawing functionality.
 
 If you set one of the test programs as a startup project, you can run it directly from Visual Studio.
 

test/CMakeLists.txt

@@ -123,7 +123,7 @@ add_sdl_test_executable(testatomic NONINTERACTIVE testatomic.c)
 add_sdl_test_executable(testintersections testintersections.c)
 add_sdl_test_executable(testrelative testrelative.c)
 add_sdl_test_executable(testhittesting testhittesting.c)
-add_sdl_test_executable(testdraw2 testdraw2.c)
+add_sdl_test_executable(testdraw testdraw.c)
 add_sdl_test_executable(testdrawchessboard testdrawchessboard.c)
 add_sdl_test_executable(testdropfile testdropfile.c)
 add_sdl_test_executable(testerror NONINTERACTIVE testerror.c)
@@ -137,7 +137,7 @@ endif()
 add_sdl_test_executable(testfile testfile.c)
 add_sdl_test_executable(testgamepad NEEDS_RESOURCES TESTUTILS testgamepad.c)
 add_sdl_test_executable(testgeometry TESTUTILS testgeometry.c)
-add_sdl_test_executable(testgl2 testgl2.c)
+add_sdl_test_executable(testgl testgl.c)
 add_sdl_test_executable(testgles testgles.c)
 add_sdl_test_executable(testgles2 testgles2.c)
 add_sdl_test_executable(testgles2_sdf TESTUTILS testgles2_sdf.c)
@@ -174,7 +174,7 @@ elseif(HAVE_X11)
     target_link_libraries(testnative PRIVATE X11)
 endif()
 
-add_sdl_test_executable(testoverlay2 NEEDS_RESOURCES TESTUTILS testoverlay2.c)
+add_sdl_test_executable(testoverlay NEEDS_RESOURCES TESTUTILS testoverlay.c)
 add_sdl_test_executable(testplatform NONINTERACTIVE testplatform.c)
 add_sdl_test_executable(testpower NONINTERACTIVE testpower.c)
 add_sdl_test_executable(testfilesystem NONINTERACTIVE testfilesystem.c)
@@ -184,14 +184,14 @@ add_sdl_test_executable(testsem testsem.c)
 add_sdl_test_executable(testsensor testsensor.c)
 add_sdl_test_executable(testshader NEEDS_RESOURCES testshader.c)
 add_sdl_test_executable(testshape NEEDS_RESOURCES testshape.c)
-add_sdl_test_executable(testsprite2 NEEDS_RESOURCES TESTUTILS testsprite2.c)
+add_sdl_test_executable(testsprite NEEDS_RESOURCES TESTUTILS testsprite.c)
 add_sdl_test_executable(testspriteminimal NEEDS_RESOURCES TESTUTILS testspriteminimal.c)
 add_sdl_test_executable(teststreaming NEEDS_RESOURCES TESTUTILS teststreaming.c)
 add_sdl_test_executable(testtimer NONINTERACTIVE testtimer.c)
 add_sdl_test_executable(testurl testurl.c)
 add_sdl_test_executable(testver NONINTERACTIVE testver.c)
 add_sdl_test_executable(testviewport NEEDS_RESOURCES TESTUTILS testviewport.c)
-add_sdl_test_executable(testwm2 testwm2.c)
+add_sdl_test_executable(testwm testwm.c)
 add_sdl_test_executable(testyuv NEEDS_RESOURCES testyuv.c testyuv_cvt.c)
 add_sdl_test_executable(torturethread torturethread.c)
 add_sdl_test_executable(testrendercopyex NEEDS_RESOURCES TESTUTILS testrendercopyex.c)
@@ -241,14 +241,14 @@ endif()
 if(OPENGL_FOUND)
     if(TARGET OpenGL::GL)
         target_link_libraries(testshader PRIVATE OpenGL::GL)
-        target_link_libraries(testgl2 PRIVATE OpenGL::GL)
+        target_link_libraries(testgl PRIVATE OpenGL::GL)
     else()
         if(EMSCRIPTEN AND OPENGL_gl_LIBRARY STREQUAL "nul")
             set(OPENGL_gl_LIBRARY GL)
         endif()
         # emscripten's FindOpenGL.cmake does not create OpenGL::GL
         target_link_libraries(testshader PRIVATE ${OPENGL_gl_LIBRARY})
-        target_link_libraries(testgl2 PRIVATE ${OPENGL_gl_LIBRARY})
+        target_link_libraries(testgl PRIVATE ${OPENGL_gl_LIBRARY})
     endif()
 endif()
 if(EMSCRIPTEN)

test/README

@@ -8,7 +8,7 @@ These are test programs for the SDL library:
 	testaudioinfo	Lists audio device capabilities
 	testerror	Tests multi-threaded error handling
 	testfile	Tests RWops layer
-	testgl2		A very simple example of using OpenGL with SDL
+	testgl		A very simple example of using OpenGL with SDL
 	testiconv	Tests international string conversion
 	testjoystick	List joysticks and watch joystick events
 	testkeys	List the available keyboard keys
@@ -17,15 +17,15 @@ These are test programs for the SDL library:
 	testlock	Hacked up test of multi-threading and locking
 	testmouse	Tests mouse coordinates
 	testmultiaudio	Tests using several audio devices
-	testoverlay2	Tests the overlay flickering/scaling during playback.
+	testoverlay	Tests the overlay flickering/scaling during playback.
 	testplatform	Tests types, endianness and cpu capabilities
 	testsem		Tests SDL's semaphore implementation
 	testshape	Tests shaped windows
-	testsprite2	Example of fast sprite movement on the screen
+	testsprite	Example of fast sprite movement on the screen
 	testthread	Hacked up test of multi-threading
 	testtimer	Test the timer facilities
 	testver		Check the version and dynamic loading and endianness
-	testwm2		Test window manager -- title, icon, events
+	testwm		Test window manager -- title, icon, events
 	torturethread	Simple test for thread creation/destruction
 	gamepadmap   Useful to generate Game Controller API compatible maps