diff --git a/VisualC-GDK/SDL/SDL.vcxproj b/VisualC-GDK/SDL/SDL.vcxproj
index 8c5d6202a9..4041d532a9 100644
--- a/VisualC-GDK/SDL/SDL.vcxproj
+++ b/VisualC-GDK/SDL/SDL.vcxproj
@@ -765,9 +765,9 @@
     <ClCompile Include="..\..\src\render\direct3d\SDL_render_d3d.c" />
     <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
     <ClCompile Include="..\..\src\render\direct3d\SDL_shaders_d3d.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_pipeline_gpu.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_render_gpu.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_shaders_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_pipeline_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_render_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_shaders_gpu.c" />
     <ClCompile Include="..\..\src\render\opengl\SDL_render_gl.c" />
     <ClCompile Include="..\..\src\render\opengl\SDL_shaders_gl.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
diff --git a/VisualC/SDL/SDL.vcxproj b/VisualC/SDL/SDL.vcxproj
index 77b40f7d93..d1e3a2bb5e 100644
--- a/VisualC/SDL/SDL.vcxproj
+++ b/VisualC/SDL/SDL.vcxproj
@@ -621,9 +621,9 @@
     <ClCompile Include="..\..\src\render\direct3d\SDL_render_d3d.c" />
     <ClCompile Include="..\..\src\render\direct3d11\SDL_render_d3d11.c" />
     <ClCompile Include="..\..\src\render\direct3d\SDL_shaders_d3d.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_pipeline_gpu.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_render_gpu.c" />
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_shaders_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_pipeline_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_render_gpu.c" />
+    <ClCompile Include="..\..\src\render\gpu\SDL_shaders_gpu.c" />
     <ClCompile Include="..\..\src\render\opengl\SDL_render_gl.c" />
     <ClCompile Include="..\..\src\render\opengl\SDL_shaders_gl.c" />
     <ClCompile Include="..\..\src\render\opengles2\SDL_render_gles2.c" />
diff --git a/VisualC/SDL/SDL.vcxproj.filters b/VisualC/SDL/SDL.vcxproj.filters
index f08b4bd78b..20a50bda4b 100644
--- a/VisualC/SDL/SDL.vcxproj.filters
+++ b/VisualC/SDL/SDL.vcxproj.filters
@@ -1490,14 +1490,14 @@
     <ClCompile Include="..\..\src\render\direct3d11\SDL_shaders_d3d11.c">
       <Filter>render\direct3d11</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_pipeline_gpu.c">
-      <Filter>render\sdlgpu</Filter>
+    <ClCompile Include="..\..\src\render\gpu\SDL_pipeline_gpu.c">
+      <Filter>render\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_render_gpu.c">
-      <Filter>render\sdlgpu</Filter>
+    <ClCompile Include="..\..\src\render\gpu\SDL_render_gpu.c">
+      <Filter>render\gpu</Filter>
     </ClCompile>
-    <ClCompile Include="..\..\src\render\sdlgpu\SDL_shaders_gpu.c">
-      <Filter>render\sdlgpu</Filter>
+    <ClCompile Include="..\..\src\render\gpu\SDL_shaders_gpu.c">
+      <Filter>render\gpu</Filter>
     </ClCompile>
     <ClCompile Include="..\..\src\render\opengl\SDL_render_gl.c">
       <Filter>render\opengl</Filter>
diff --git a/Xcode/SDL/SDL.xcodeproj/project.pbxproj b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
index 677d08af73..fc0651eab0 100644
--- a/Xcode/SDL/SDL.xcodeproj/project.pbxproj
+++ b/Xcode/SDL/SDL.xcodeproj/project.pbxproj
@@ -2104,10 +2104,10 @@
 		A7D8A8DA23E2514000DCD162 /* render */ = {
 			isa = PBXGroup;
 			children = (
+				F3A9AE912C8A139C00AAC390 /* gpu */,
 				A7D8A8DD23E2514000DCD162 /* metal */,
 				A7D8A90C23E2514000DCD162 /* opengl */,
 				A7D8A90323E2514000DCD162 /* opengles2 */,
-				F3A9AE912C8A139C00AAC390 /* sdlgpu */,
 				A7D8A8EF23E2514000DCD162 /* software */,
 				A7D8A8FF23E2514000DCD162 /* SDL_d3dmath.c */,
 				A7D8A8DC23E2514000DCD162 /* SDL_d3dmath.h */,
@@ -2347,7 +2347,7 @@
 			path = dummy;
 			sourceTree = "<group>";
 		};
-		F3A9AE912C8A139C00AAC390 /* sdlgpu */ = {
+		F3A9AE912C8A139C00AAC390 /* gpu */ = {
 			isa = PBXGroup;
 			children = (
 				F3A9AE922C8A13C100AAC390 /* SDL_gpu_util.h */,
@@ -2357,7 +2357,7 @@
 				F3A9AE942C8A13C100AAC390 /* SDL_shaders_gpu.c */,
 				F3A9AE972C8A13C100AAC390 /* SDL_shaders_gpu.h */,
 			);
-			path = sdlgpu;
+			path = gpu;
 			sourceTree = "<group>";
 		};
 		F3ADAB8C2576F08500A6B1D9 /* ios */ = {
diff --git a/src/render/sdlgpu/SDL_gpu_util.h b/src/render/gpu/SDL_gpu_util.h
similarity index 100%
rename from src/render/sdlgpu/SDL_gpu_util.h
rename to src/render/gpu/SDL_gpu_util.h
diff --git a/src/render/sdlgpu/SDL_pipeline_gpu.c b/src/render/gpu/SDL_pipeline_gpu.c
similarity index 100%
rename from src/render/sdlgpu/SDL_pipeline_gpu.c
rename to src/render/gpu/SDL_pipeline_gpu.c
diff --git a/src/render/sdlgpu/SDL_pipeline_gpu.h b/src/render/gpu/SDL_pipeline_gpu.h
similarity index 100%
rename from src/render/sdlgpu/SDL_pipeline_gpu.h
rename to src/render/gpu/SDL_pipeline_gpu.h
diff --git a/src/render/sdlgpu/SDL_render_gpu.c b/src/render/gpu/SDL_render_gpu.c
similarity index 100%
rename from src/render/sdlgpu/SDL_render_gpu.c
rename to src/render/gpu/SDL_render_gpu.c
diff --git a/src/render/sdlgpu/SDL_shaders_gpu.c b/src/render/gpu/SDL_shaders_gpu.c
similarity index 100%
rename from src/render/sdlgpu/SDL_shaders_gpu.c
rename to src/render/gpu/SDL_shaders_gpu.c
diff --git a/src/render/sdlgpu/SDL_shaders_gpu.h b/src/render/gpu/SDL_shaders_gpu.h
similarity index 100%
rename from src/render/sdlgpu/SDL_shaders_gpu.h
rename to src/render/gpu/SDL_shaders_gpu.h
diff --git a/src/render/sdlgpu/shaders/.gitattributes b/src/render/gpu/shaders/.gitattributes
similarity index 100%
rename from src/render/sdlgpu/shaders/.gitattributes
rename to src/render/gpu/shaders/.gitattributes
diff --git a/src/render/sdlgpu/shaders/.gitignore b/src/render/gpu/shaders/.gitignore
similarity index 100%
rename from src/render/sdlgpu/shaders/.gitignore
rename to src/render/gpu/shaders/.gitignore
diff --git a/src/render/sdlgpu/shaders/build-shaders.sh b/src/render/gpu/shaders/build-shaders.sh
similarity index 100%
rename from src/render/sdlgpu/shaders/build-shaders.sh
rename to src/render/gpu/shaders/build-shaders.sh
diff --git a/src/render/sdlgpu/shaders/color.frag b/src/render/gpu/shaders/color.frag
similarity index 100%
rename from src/render/sdlgpu/shaders/color.frag
rename to src/render/gpu/shaders/color.frag
diff --git a/src/render/sdlgpu/shaders/color.frag.metal.h b/src/render/gpu/shaders/color.frag.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/color.frag.metal.h
rename to src/render/gpu/shaders/color.frag.metal.h
diff --git a/src/render/sdlgpu/shaders/color.frag.sm50.dxbc.h b/src/render/gpu/shaders/color.frag.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/color.frag.sm50.dxbc.h
rename to src/render/gpu/shaders/color.frag.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/color.frag.sm60.dxil.h b/src/render/gpu/shaders/color.frag.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/color.frag.sm60.dxil.h
rename to src/render/gpu/shaders/color.frag.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/color.frag.spv.h b/src/render/gpu/shaders/color.frag.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/color.frag.spv.h
rename to src/render/gpu/shaders/color.frag.spv.h
diff --git a/src/render/sdlgpu/shaders/dxbc50.h b/src/render/gpu/shaders/dxbc50.h
similarity index 100%
rename from src/render/sdlgpu/shaders/dxbc50.h
rename to src/render/gpu/shaders/dxbc50.h
diff --git a/src/render/sdlgpu/shaders/dxil60.h b/src/render/gpu/shaders/dxil60.h
similarity index 100%
rename from src/render/sdlgpu/shaders/dxil60.h
rename to src/render/gpu/shaders/dxil60.h
diff --git a/src/render/sdlgpu/shaders/fix-shaders.sh b/src/render/gpu/shaders/fix-shaders.sh
similarity index 100%
rename from src/render/sdlgpu/shaders/fix-shaders.sh
rename to src/render/gpu/shaders/fix-shaders.sh
diff --git a/src/render/sdlgpu/shaders/linepoint.vert b/src/render/gpu/shaders/linepoint.vert
similarity index 100%
rename from src/render/sdlgpu/shaders/linepoint.vert
rename to src/render/gpu/shaders/linepoint.vert
diff --git a/src/render/sdlgpu/shaders/linepoint.vert.metal.h b/src/render/gpu/shaders/linepoint.vert.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/linepoint.vert.metal.h
rename to src/render/gpu/shaders/linepoint.vert.metal.h
diff --git a/src/render/sdlgpu/shaders/linepoint.vert.sm50.dxbc.h b/src/render/gpu/shaders/linepoint.vert.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/linepoint.vert.sm50.dxbc.h
rename to src/render/gpu/shaders/linepoint.vert.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/linepoint.vert.sm60.dxil.h b/src/render/gpu/shaders/linepoint.vert.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/linepoint.vert.sm60.dxil.h
rename to src/render/gpu/shaders/linepoint.vert.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/linepoint.vert.spv.h b/src/render/gpu/shaders/linepoint.vert.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/linepoint.vert.spv.h
rename to src/render/gpu/shaders/linepoint.vert.spv.h
diff --git a/src/render/sdlgpu/shaders/metal.h b/src/render/gpu/shaders/metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/metal.h
rename to src/render/gpu/shaders/metal.h
diff --git a/src/render/sdlgpu/shaders/spir-v.h b/src/render/gpu/shaders/spir-v.h
similarity index 100%
rename from src/render/sdlgpu/shaders/spir-v.h
rename to src/render/gpu/shaders/spir-v.h
diff --git a/src/render/sdlgpu/shaders/texture_rgb.frag b/src/render/gpu/shaders/texture_rgb.frag
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgb.frag
rename to src/render/gpu/shaders/texture_rgb.frag
diff --git a/src/render/sdlgpu/shaders/texture_rgb.frag.metal.h b/src/render/gpu/shaders/texture_rgb.frag.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgb.frag.metal.h
rename to src/render/gpu/shaders/texture_rgb.frag.metal.h
diff --git a/src/render/sdlgpu/shaders/texture_rgb.frag.sm50.dxbc.h b/src/render/gpu/shaders/texture_rgb.frag.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgb.frag.sm50.dxbc.h
rename to src/render/gpu/shaders/texture_rgb.frag.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/texture_rgb.frag.sm60.dxil.h b/src/render/gpu/shaders/texture_rgb.frag.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgb.frag.sm60.dxil.h
rename to src/render/gpu/shaders/texture_rgb.frag.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/texture_rgb.frag.spv.h b/src/render/gpu/shaders/texture_rgb.frag.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgb.frag.spv.h
rename to src/render/gpu/shaders/texture_rgb.frag.spv.h
diff --git a/src/render/sdlgpu/shaders/texture_rgba.frag b/src/render/gpu/shaders/texture_rgba.frag
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgba.frag
rename to src/render/gpu/shaders/texture_rgba.frag
diff --git a/src/render/sdlgpu/shaders/texture_rgba.frag.metal.h b/src/render/gpu/shaders/texture_rgba.frag.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgba.frag.metal.h
rename to src/render/gpu/shaders/texture_rgba.frag.metal.h
diff --git a/src/render/sdlgpu/shaders/texture_rgba.frag.sm50.dxbc.h b/src/render/gpu/shaders/texture_rgba.frag.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgba.frag.sm50.dxbc.h
rename to src/render/gpu/shaders/texture_rgba.frag.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/texture_rgba.frag.sm60.dxil.h b/src/render/gpu/shaders/texture_rgba.frag.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgba.frag.sm60.dxil.h
rename to src/render/gpu/shaders/texture_rgba.frag.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/texture_rgba.frag.spv.h b/src/render/gpu/shaders/texture_rgba.frag.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/texture_rgba.frag.spv.h
rename to src/render/gpu/shaders/texture_rgba.frag.spv.h
diff --git a/src/render/sdlgpu/shaders/tri_color.vert b/src/render/gpu/shaders/tri_color.vert
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_color.vert
rename to src/render/gpu/shaders/tri_color.vert
diff --git a/src/render/sdlgpu/shaders/tri_color.vert.metal.h b/src/render/gpu/shaders/tri_color.vert.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_color.vert.metal.h
rename to src/render/gpu/shaders/tri_color.vert.metal.h
diff --git a/src/render/sdlgpu/shaders/tri_color.vert.sm50.dxbc.h b/src/render/gpu/shaders/tri_color.vert.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_color.vert.sm50.dxbc.h
rename to src/render/gpu/shaders/tri_color.vert.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/tri_color.vert.sm60.dxil.h b/src/render/gpu/shaders/tri_color.vert.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_color.vert.sm60.dxil.h
rename to src/render/gpu/shaders/tri_color.vert.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/tri_color.vert.spv.h b/src/render/gpu/shaders/tri_color.vert.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_color.vert.spv.h
rename to src/render/gpu/shaders/tri_color.vert.spv.h
diff --git a/src/render/sdlgpu/shaders/tri_texture.vert b/src/render/gpu/shaders/tri_texture.vert
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_texture.vert
rename to src/render/gpu/shaders/tri_texture.vert
diff --git a/src/render/sdlgpu/shaders/tri_texture.vert.metal.h b/src/render/gpu/shaders/tri_texture.vert.metal.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_texture.vert.metal.h
rename to src/render/gpu/shaders/tri_texture.vert.metal.h
diff --git a/src/render/sdlgpu/shaders/tri_texture.vert.sm50.dxbc.h b/src/render/gpu/shaders/tri_texture.vert.sm50.dxbc.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_texture.vert.sm50.dxbc.h
rename to src/render/gpu/shaders/tri_texture.vert.sm50.dxbc.h
diff --git a/src/render/sdlgpu/shaders/tri_texture.vert.sm60.dxil.h b/src/render/gpu/shaders/tri_texture.vert.sm60.dxil.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_texture.vert.sm60.dxil.h
rename to src/render/gpu/shaders/tri_texture.vert.sm60.dxil.h
diff --git a/src/render/sdlgpu/shaders/tri_texture.vert.spv.h b/src/render/gpu/shaders/tri_texture.vert.spv.h
similarity index 100%
rename from src/render/sdlgpu/shaders/tri_texture.vert.spv.h
rename to src/render/gpu/shaders/tri_texture.vert.spv.h