Sam Lantinga 7 месяцев назад
Родитель
Сommit
4123023d3e
48 измененных файлов с 15 добавлено и 15 удалено
  1. 3 3
      VisualC-GDK/SDL/SDL.vcxproj
  2. 3 3
      VisualC/SDL/SDL.vcxproj
  3. 6 6
      VisualC/SDL/SDL.vcxproj.filters
  4. 3 3
      Xcode/SDL/SDL.xcodeproj/project.pbxproj
  5. 0 0
      src/render/gpu/SDL_gpu_util.h
  6. 0 0
      src/render/gpu/SDL_pipeline_gpu.c
  7. 0 0
      src/render/gpu/SDL_pipeline_gpu.h
  8. 0 0
      src/render/gpu/SDL_render_gpu.c
  9. 0 0
      src/render/gpu/SDL_shaders_gpu.c
  10. 0 0
      src/render/gpu/SDL_shaders_gpu.h
  11. 0 0
      src/render/gpu/shaders/.gitattributes
  12. 0 0
      src/render/gpu/shaders/.gitignore
  13. 0 0
      src/render/gpu/shaders/build-shaders.sh
  14. 0 0
      src/render/gpu/shaders/color.frag
  15. 0 0
      src/render/gpu/shaders/color.frag.metal.h
  16. 0 0
      src/render/gpu/shaders/color.frag.sm50.dxbc.h
  17. 0 0
      src/render/gpu/shaders/color.frag.sm60.dxil.h
  18. 0 0
      src/render/gpu/shaders/color.frag.spv.h
  19. 0 0
      src/render/gpu/shaders/dxbc50.h
  20. 0 0
      src/render/gpu/shaders/dxil60.h
  21. 0 0
      src/render/gpu/shaders/fix-shaders.sh
  22. 0 0
      src/render/gpu/shaders/linepoint.vert
  23. 0 0
      src/render/gpu/shaders/linepoint.vert.metal.h
  24. 0 0
      src/render/gpu/shaders/linepoint.vert.sm50.dxbc.h
  25. 0 0
      src/render/gpu/shaders/linepoint.vert.sm60.dxil.h
  26. 0 0
      src/render/gpu/shaders/linepoint.vert.spv.h
  27. 0 0
      src/render/gpu/shaders/metal.h
  28. 0 0
      src/render/gpu/shaders/spir-v.h
  29. 0 0
      src/render/gpu/shaders/texture_rgb.frag
  30. 0 0
      src/render/gpu/shaders/texture_rgb.frag.metal.h
  31. 0 0
      src/render/gpu/shaders/texture_rgb.frag.sm50.dxbc.h
  32. 0 0
      src/render/gpu/shaders/texture_rgb.frag.sm60.dxil.h
  33. 0 0
      src/render/gpu/shaders/texture_rgb.frag.spv.h
  34. 0 0
      src/render/gpu/shaders/texture_rgba.frag
  35. 0 0
      src/render/gpu/shaders/texture_rgba.frag.metal.h
  36. 0 0
      src/render/gpu/shaders/texture_rgba.frag.sm50.dxbc.h
  37. 0 0
      src/render/gpu/shaders/texture_rgba.frag.sm60.dxil.h
  38. 0 0
      src/render/gpu/shaders/texture_rgba.frag.spv.h
  39. 0 0
      src/render/gpu/shaders/tri_color.vert
  40. 0 0
      src/render/gpu/shaders/tri_color.vert.metal.h
  41. 0 0
      src/render/gpu/shaders/tri_color.vert.sm50.dxbc.h
  42. 0 0
      src/render/gpu/shaders/tri_color.vert.sm60.dxil.h
  43. 0 0
      src/render/gpu/shaders/tri_color.vert.spv.h
  44. 0 0
      src/render/gpu/shaders/tri_texture.vert
  45. 0 0
      src/render/gpu/shaders/tri_texture.vert.metal.h
  46. 0 0
      src/render/gpu/shaders/tri_texture.vert.sm50.dxbc.h
  47. 0 0
      src/render/gpu/shaders/tri_texture.vert.sm60.dxil.h
  48. 0 0
      src/render/gpu/shaders/tri_texture.vert.spv.h

+ 3 - 3
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" />

+ 3 - 3
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" />

+ 6 - 6
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>

+ 3 - 3
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 */ = {

+ 0 - 0
src/render/sdlgpu/SDL_gpu_util.h → src/render/gpu/SDL_gpu_util.h


+ 0 - 0
src/render/sdlgpu/SDL_pipeline_gpu.c → src/render/gpu/SDL_pipeline_gpu.c


+ 0 - 0
src/render/sdlgpu/SDL_pipeline_gpu.h → src/render/gpu/SDL_pipeline_gpu.h


+ 0 - 0
src/render/sdlgpu/SDL_render_gpu.c → src/render/gpu/SDL_render_gpu.c


+ 0 - 0
src/render/sdlgpu/SDL_shaders_gpu.c → src/render/gpu/SDL_shaders_gpu.c


+ 0 - 0
src/render/sdlgpu/SDL_shaders_gpu.h → src/render/gpu/SDL_shaders_gpu.h


+ 0 - 0
src/render/sdlgpu/shaders/.gitattributes → src/render/gpu/shaders/.gitattributes


+ 0 - 0
src/render/sdlgpu/shaders/.gitignore → src/render/gpu/shaders/.gitignore


+ 0 - 0
src/render/sdlgpu/shaders/build-shaders.sh → src/render/gpu/shaders/build-shaders.sh


+ 0 - 0
src/render/sdlgpu/shaders/color.frag → src/render/gpu/shaders/color.frag


+ 0 - 0
src/render/sdlgpu/shaders/color.frag.metal.h → src/render/gpu/shaders/color.frag.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/color.frag.sm50.dxbc.h → src/render/gpu/shaders/color.frag.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/color.frag.sm60.dxil.h → src/render/gpu/shaders/color.frag.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/color.frag.spv.h → src/render/gpu/shaders/color.frag.spv.h


+ 0 - 0
src/render/sdlgpu/shaders/dxbc50.h → src/render/gpu/shaders/dxbc50.h


+ 0 - 0
src/render/sdlgpu/shaders/dxil60.h → src/render/gpu/shaders/dxil60.h


+ 0 - 0
src/render/sdlgpu/shaders/fix-shaders.sh → src/render/gpu/shaders/fix-shaders.sh


+ 0 - 0
src/render/sdlgpu/shaders/linepoint.vert → src/render/gpu/shaders/linepoint.vert


+ 0 - 0
src/render/sdlgpu/shaders/linepoint.vert.metal.h → src/render/gpu/shaders/linepoint.vert.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/linepoint.vert.sm50.dxbc.h → src/render/gpu/shaders/linepoint.vert.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/linepoint.vert.sm60.dxil.h → src/render/gpu/shaders/linepoint.vert.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/linepoint.vert.spv.h → src/render/gpu/shaders/linepoint.vert.spv.h


+ 0 - 0
src/render/sdlgpu/shaders/metal.h → src/render/gpu/shaders/metal.h


+ 0 - 0
src/render/sdlgpu/shaders/spir-v.h → src/render/gpu/shaders/spir-v.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgb.frag → src/render/gpu/shaders/texture_rgb.frag


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgb.frag.metal.h → src/render/gpu/shaders/texture_rgb.frag.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgb.frag.sm50.dxbc.h → src/render/gpu/shaders/texture_rgb.frag.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgb.frag.sm60.dxil.h → src/render/gpu/shaders/texture_rgb.frag.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgb.frag.spv.h → src/render/gpu/shaders/texture_rgb.frag.spv.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgba.frag → src/render/gpu/shaders/texture_rgba.frag


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgba.frag.metal.h → src/render/gpu/shaders/texture_rgba.frag.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgba.frag.sm50.dxbc.h → src/render/gpu/shaders/texture_rgba.frag.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgba.frag.sm60.dxil.h → src/render/gpu/shaders/texture_rgba.frag.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/texture_rgba.frag.spv.h → src/render/gpu/shaders/texture_rgba.frag.spv.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_color.vert → src/render/gpu/shaders/tri_color.vert


+ 0 - 0
src/render/sdlgpu/shaders/tri_color.vert.metal.h → src/render/gpu/shaders/tri_color.vert.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_color.vert.sm50.dxbc.h → src/render/gpu/shaders/tri_color.vert.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_color.vert.sm60.dxil.h → src/render/gpu/shaders/tri_color.vert.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_color.vert.spv.h → src/render/gpu/shaders/tri_color.vert.spv.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_texture.vert → src/render/gpu/shaders/tri_texture.vert


+ 0 - 0
src/render/sdlgpu/shaders/tri_texture.vert.metal.h → src/render/gpu/shaders/tri_texture.vert.metal.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_texture.vert.sm50.dxbc.h → src/render/gpu/shaders/tri_texture.vert.sm50.dxbc.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_texture.vert.sm60.dxil.h → src/render/gpu/shaders/tri_texture.vert.sm60.dxil.h


+ 0 - 0
src/render/sdlgpu/shaders/tri_texture.vert.spv.h → src/render/gpu/shaders/tri_texture.vert.spv.h