From 1d956c2817376c775f0deaed0f7962c4486059f3 Mon Sep 17 00:00:00 2001
From: Sam Lantinga <[EMAIL REDACTED]>
Date: Tue, 3 Jan 2023 10:28:18 -0800
Subject: [PATCH] Rename SDL2 tests for SDL3
---
.gitignore | 14 +-
VisualC-GDK/SDL.sln | 2 +-
VisualC-GDK/tests/testgdk/testgdk.vcxproj | 14 +-
.../PackageLayout.xml | 2 +-
.../testsprite.vcxproj} | 16 +-
.../testsprite.vcxproj.filters} | 2 +-
.../wingdk/MicrosoftGame.config | 6 +-
.../xboxone/MicrosoftGame.config | 6 +-
.../xboxseries/MicrosoftGame.config | 6 +-
VisualC-WinRT/SDL-UWP.sln | 2 +-
.../Assets/LockScreenLogo.scale-200.png | Bin
.../Assets/SplashScreen.scale-200.png | Bin
.../Assets/Square150x150Logo.scale-200.png | Bin
.../Assets/Square44x44Logo.scale-200.png | Bin
...x44Logo.targetsize-24_altform-unplated.png | Bin
.../Assets/StoreLogo.png | Bin
.../Assets/Wide310x150Logo.scale-200.png | Bin
.../Package.appxmanifest | 8 +-
.../testdraw.vcxproj} | 4 +-
.../testdraw.vcxproj.filters} | 2 +-
VisualC/SDL.sln | 10 +-
.../testdraw.vcxproj} | 12 +-
.../testgl2.vcxproj => testgl/testgl.vcxproj} | 12 +-
.../testoverlay.vcxproj} | 12 +-
.../testsprite.vcxproj} | 12 +-
.../testwm2.vcxproj => testwm/testwm.vcxproj} | 12 +-
.../SDLTest/SDLTest.xcodeproj/project.pbxproj | 160 +++++++++---------
docs/README-emscripten.md | 2 +-
docs/README-gdk.md | 2 +-
test/CMakeLists.txt | 14 +-
test/README | 8 +-
test/{testdraw2.c => testdraw.c} | 0
test/{testgl2.c => testgl.c} | 0
test/{testoverlay2.c => testoverlay.c} | 0
test/{testsprite2.c => testsprite.c} | 0
test/{testwm2.c => testwm.c} | 0
36 files changed, 170 insertions(+), 170 deletions(-)
rename VisualC-GDK/tests/{testsprite2 => testsprite}/PackageLayout.xml (96%)
rename VisualC-GDK/tests/{testsprite2/testsprite2.vcxproj => testsprite/testsprite.vcxproj} (97%)
rename VisualC-GDK/tests/{testsprite2/testsprite2.vcxproj.filters => testsprite/testsprite.vcxproj.filters} (96%)
rename VisualC-GDK/tests/{testsprite2 => testsprite}/wingdk/MicrosoftGame.config (86%)
rename VisualC-GDK/tests/{testsprite2 => testsprite}/xboxone/MicrosoftGame.config (85%)
rename VisualC-GDK/tests/{testsprite2 => testsprite}/xboxseries/MicrosoftGame.config (85%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/LockScreenLogo.scale-200.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/SplashScreen.scale-200.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/Square150x150Logo.scale-200.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/Square44x44Logo.scale-200.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/Square44x44Logo.targetsize-24_altform-unplated.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/StoreLogo.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Assets/Wide310x150Logo.scale-200.png (100%)
rename VisualC-WinRT/{TestDraw2 => testdraw}/Package.appxmanifest (90%)
rename VisualC-WinRT/{TestDraw2/TestDraw2.vcxproj => testdraw/testdraw.vcxproj} (99%)
rename VisualC-WinRT/{TestDraw2/TestDraw2.vcxproj.filters => testdraw/testdraw.vcxproj.filters} (98%)
rename VisualC/tests/{testdraw2/testdraw2.vcxproj => testdraw/testdraw.vcxproj} (95%)
rename VisualC/tests/{testgl2/testgl2.vcxproj => testgl/testgl.vcxproj} (95%)
rename VisualC/tests/{testoverlay2/testoverlay2.vcxproj => testoverlay/testoverlay.vcxproj} (95%)
rename VisualC/tests/{testsprite2/testsprite2.vcxproj => testsprite/testsprite.vcxproj} (95%)
rename VisualC/tests/{testwm2/testwm2.vcxproj => testwm/testwm.vcxproj} (95%)
rename test/{testdraw2.c => testdraw.c} (100%)
rename test/{testgl2.c => testgl.c} (100%)
rename test/{testoverlay2.c => testoverlay.c} (100%)
rename test/{testsprite2.c => testsprite.c} (100%)
rename test/{testwm2.c => testwm.c} (100%)
diff --git a/.gitignore b/.gitignore
index 6ef27cfe2623..8d91ed621983 100644
--- a/.gitignore
+++ b/.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
diff --git a/VisualC-GDK/SDL.sln b/VisualC-GDK/SDL.sln
index f013153e8dfb..5eef5d91bd36 100644
--- a/VisualC-GDK/SDL.sln
+++ b/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
diff --git a/VisualC-GDK/tests/testgdk/testgdk.vcxproj b/VisualC-GDK/tests/testgdk/testgdk.vcxproj
index 22106cb3a60c..c0e74e22e3ec 100644
--- a/VisualC-GDK/tests/testgdk/testgdk.vcxproj
+++ b/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>
diff --git a/VisualC-GDK/tests/testsprite2/PackageLayout.xml b/VisualC-GDK/tests/testsprite/PackageLayout.xml
similarity index 96%
rename from VisualC-GDK/tests/testsprite2/PackageLayout.xml
rename to VisualC-GDK/tests/testsprite/PackageLayout.xml
index 62ca97bbec37..60a83782da78 100644
--- a/VisualC-GDK/tests/testsprite2/PackageLayout.xml
+++ b/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" />
diff --git a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj b/VisualC-GDK/tests/testsprite/testsprite.vcxproj
similarity index 97%
rename from VisualC-GDK/tests/testsprite2/testsprite2.vcxproj
rename to VisualC-GDK/tests/testsprite/testsprite.vcxproj
index 770ff8a4be14..211f14cb96e3 100644
--- a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj
+++ b/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>
diff --git a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj.filters b/VisualC-GDK/tests/testsprite/testsprite.vcxproj.filters
similarity index 96%
rename from VisualC-GDK/tests/testsprite2/testsprite2.vcxproj.filters
rename to VisualC-GDK/tests/testsprite/testsprite.vcxproj.filters
index e945fe548977..3e0399e1f931 100644
--- a/VisualC-GDK/tests/testsprite2/testsprite2.vcxproj.filters
+++ b/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>
diff --git a/VisualC-GDK/tests/testsprite2/wingdk/MicrosoftGame.config b/VisualC-GDK/tests/testsprite/wingdk/MicrosoftGame.config
similarity index 86%
rename from VisualC-GDK/tests/testsprite2/wingdk/MicrosoftGame.config
rename to VisualC-GDK/tests/testsprite/wingdk/MicrosoftGame.config
index 8aa5865b28fd..bbb839c7d3b1 100644
--- a/VisualC-GDK/tests/testsprite2/wingdk/MicrosoftGame.config
+++ b/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"/>
diff --git a/VisualC-GDK/tests/testsprite2/xboxone/MicrosoftGame.config b/VisualC-GDK/tests/testsprite/xboxone/MicrosoftGame.config
similarity index 85%
rename from VisualC-GDK/tests/testsprite2/xboxone/MicrosoftGame.config
rename to VisualC-GDK/tests/testsprite/xboxone/MicrosoftGame.config
index 23ac15a84959..14fbf7dfbd0c 100644
--- a/VisualC-GDK/tests/testsprite2/xboxone/MicrosoftGame.config
+++ b/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"/>
diff --git a/VisualC-GDK/tests/testsprite2/xboxseries/MicrosoftGame.config b/VisualC-GDK/tests/testsprite/xboxseries/MicrosoftGame.config
similarity index 85%
rename from VisualC-GDK/tests/testsprite2/xboxseries/MicrosoftGame.config
rename to VisualC-GDK/tests/testsprite/xboxseries/MicrosoftGame.config
index 288ee2901919..402b89e3d1fa 100644
--- a/VisualC-GDK/tests/testsprite2/xboxseries/MicrosoftGame.config
+++ b/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"
diff --git a/VisualC-WinRT/SDL-UWP.sln b/VisualC-WinRT/SDL-UWP.sln
index bb6346c73a08..fad1f7bc0a7e 100644
--- a/VisualC-WinRT/SDL-UWP.sln
+++ b/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
diff --git a/VisualC-WinRT/TestDraw2/Assets/LockScreenLogo.scale-200.png b/VisualC-WinRT/testdraw/Assets/LockScreenLogo.scale-200.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/LockScreenLogo.scale-200.png
rename to VisualC-WinRT/testdraw/Assets/LockScreenLogo.scale-200.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/SplashScreen.scale-200.png b/VisualC-WinRT/testdraw/Assets/SplashScreen.scale-200.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/SplashScreen.scale-200.png
rename to VisualC-WinRT/testdraw/Assets/SplashScreen.scale-200.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/Square150x150Logo.scale-200.png b/VisualC-WinRT/testdraw/Assets/Square150x150Logo.scale-200.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/Square150x150Logo.scale-200.png
rename to VisualC-WinRT/testdraw/Assets/Square150x150Logo.scale-200.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/Square44x44Logo.scale-200.png b/VisualC-WinRT/testdraw/Assets/Square44x44Logo.scale-200.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/Square44x44Logo.scale-200.png
rename to VisualC-WinRT/testdraw/Assets/Square44x44Logo.scale-200.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/Square44x44Logo.targetsize-24_altform-unplated.png b/VisualC-WinRT/testdraw/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
rename to VisualC-WinRT/testdraw/Assets/Square44x44Logo.targetsize-24_altform-unplated.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/StoreLogo.png b/VisualC-WinRT/testdraw/Assets/StoreLogo.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/StoreLogo.png
rename to VisualC-WinRT/testdraw/Assets/StoreLogo.png
diff --git a/VisualC-WinRT/TestDraw2/Assets/Wide310x150Logo.scale-200.png b/VisualC-WinRT/testdraw/Assets/Wide310x150Logo.scale-200.png
similarity index 100%
rename from VisualC-WinRT/TestDraw2/Assets/Wide310x150Logo.scale-200.png
rename to VisualC-WinRT/testdraw/Assets/Wide310x150Logo.scale-200.png
diff --git a/VisualC-WinRT/TestDraw2/Package.appxmanifest b/VisualC-WinRT/testdraw/Package.appxmanifest
similarity index 90%
rename from VisualC-WinRT/TestDraw2/Package.appxmanifest
rename to VisualC-WinRT/testdraw/Package.appxmanifest
index f04c9ffc4d33..05a4c5750f14 100644
--- a/VisualC-WinRT/TestDraw2/Package.appxmanifest
+++ b/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" />
diff --git a/VisualC-WinRT/TestDraw2/TestDraw2.vcxproj b/VisualC-WinRT/testdraw/testdraw.vcxproj
similarity index 99%
rename from VisualC-WinRT/TestDraw2/TestDraw2.vcxproj
rename to VisualC-WinRT/testdraw/testdraw.vcxproj
index 9de6beae42fe..568b03330ea0 100644
--- a/VisualC-WinRT/TestDraw2/TestDraw2.vcxproj
+++ b/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>
diff --git a/VisualC-WinRT/TestDraw2/TestDraw2.vcxproj.filters b/VisualC-WinRT/testdraw/testdraw.vcxproj.filters
similarity index 98%
rename from VisualC-WinRT/TestDraw2/TestDraw2.vcxproj.filters
rename to VisualC-WinRT/testdraw/testdraw.vcxproj.filters
index 841b7e832add..03a0d8bb1658 100644
--- a/VisualC-WinRT/TestDraw2/TestDraw2.vcxproj.filters
+++ b/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">
diff --git a/VisualC/SDL.sln b/VisualC/SDL.sln
index 8541e9cd6dba..bd5dffa72bf0 100644
--- a/VisualC/SDL.sln
+++ b/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
diff --git a/VisualC/tests/testdraw2/testdraw2.vcxproj b/VisualC/tests/testdraw/testdraw.vcxproj
similarity index 95%
rename from VisualC/tests/testdraw2/testdraw2.vcxproj
rename to VisualC/tests/testdraw/testdraw.vcxproj
index 8fb9968017b1..9e985c3c6e2e 100644
--- a/VisualC/tests/testdraw2/testdraw2.vcxproj
+++ b/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>
<ItemGro
(Patch may be truncated, please check the link at the top of this post.)