+2 -3

demos/CMakeLists.txt

reviewed

··· 1 1 include_directories (${SDL_gpu_SOURCE_DIR}) 2 2 - include_directories(${SDL_gpu_SOURCE_DIR}/demos/common) 3 2 4 4 - add_executable(init-demo init/main.c common/demo-font.c) 3 3 + add_executable(init-demo init/main.c) 5 4 target_link_libraries (init-demo SDL_gpu) 6 5 7 7 - add_executable(3d-demo 3d/main.c common/demo-font.c) 6 6 + add_executable(3d-demo 3d/main.c) 8 7 target_link_libraries (3d-demo SDL_gpu) 9 8 10 9 add_executable(tutorial-space-demo tutorial-space/main.c)

demos/common/common.c common/common.c

reviewed

demos/common/common.h common/common.h

reviewed

demos/common/compat.h common/compat.h

reviewed

demos/common/demo-font.c common/demo-font.c

reviewed

demos/common/demo-font.h common/demo-font.h

reviewed

+43 -41

tests/CMakeLists.txt

reviewed

··· 1 1 include_directories (${SDL_gpu_SOURCE_DIR}) 2 2 - include_directories (${SDL_gpu_SOURCE_DIR}/demos/common) 2 2 + include_directories (${SDL_gpu_SOURCE_DIR}/common) 3 3 4 4 - add_executable(create-test create/main.c ../demos/common/common.c ../demos/common/demo-font.c) 4 4 + set(COMMON_SOURCE ${SDL_gpu_SOURCE_DIR}/common/common.c ${SDL_gpu_SOURCE_DIR}/common/demo-font.c) 5 5 + 6 6 + add_executable(create-test create/main.c ${COMMON_SOURCE}) 5 7 target_link_libraries (create-test SDL_gpu) 6 8 7 7 - add_executable(get-pixel-test get-pixel/main.c ../demos/common/common.c ../demos/common/demo-font.c) 9 9 + add_executable(get-pixel-test get-pixel/main.c ${COMMON_SOURCE}) 8 10 target_link_libraries (get-pixel-test SDL_gpu) 9 11 10 10 - add_executable(scale-test scale/main.c ../demos/common/common.c ../demos/common/demo-font.c) 12 12 + add_executable(scale-test scale/main.c ${COMMON_SOURCE}) 11 13 target_link_libraries (scale-test SDL_gpu) 12 14 13 13 - add_executable(transform-test transform/main.c ../demos/common/common.c ../demos/common/demo-font.c) 15 15 + add_executable(transform-test transform/main.c ${COMMON_SOURCE}) 14 16 target_link_libraries (transform-test SDL_gpu) 15 17 16 16 - add_executable(shapes-test shapes/main.c ../demos/common/common.c ../demos/common/demo-font.c) 18 18 + add_executable(shapes-test shapes/main.c ${COMMON_SOURCE}) 17 19 target_link_libraries (shapes-test SDL_gpu) 18 20 19 19 - add_executable(sprite-test sprite/main.c ../demos/common/common.c ../demos/common/demo-font.c) 21 21 + add_executable(sprite-test sprite/main.c ${COMMON_SOURCE}) 20 22 target_link_libraries (sprite-test SDL_gpu) 21 23 22 22 - add_executable(sprite-stress-test sprite-stress/main.c ../demos/common/common.c ../demos/common/demo-font.c) 24 24 + add_executable(sprite-stress-test sprite-stress/main.c ${COMMON_SOURCE}) 23 25 target_link_libraries (sprite-stress-test SDL_gpu) 24 26 25 25 - add_executable(rotate-test rotate/main.c ../demos/common/common.c ../demos/common/demo-font.c) 27 27 + add_executable(rotate-test rotate/main.c ${COMMON_SOURCE}) 26 28 target_link_libraries (rotate-test SDL_gpu) 27 29 28 28 - add_executable(render-target-test render-target/main.c ../demos/common/common.c ../demos/common/demo-font.c) 30 30 + add_executable(render-target-test render-target/main.c ${COMMON_SOURCE}) 29 31 target_link_libraries (render-target-test SDL_gpu) 30 32 31 31 - add_executable(blend-test blend/main.c ../demos/common/common.c ../demos/common/demo-font.c) 33 33 + add_executable(blend-test blend/main.c ${COMMON_SOURCE}) 32 34 target_link_libraries (blend-test SDL_gpu) 33 35 34 34 - add_executable(blend-mode-test blend-mode/main.c ../demos/common/common.c ../demos/common/demo-font.c) 36 36 + add_executable(blend-mode-test blend-mode/main.c ${COMMON_SOURCE}) 35 37 target_link_libraries (blend-mode-test SDL_gpu) 36 38 37 37 - add_executable(clip-test clip/main.c ../demos/common/common.c ../demos/common/demo-font.c) 39 39 + add_executable(clip-test clip/main.c ${COMMON_SOURCE}) 38 40 target_link_libraries (clip-test SDL_gpu) 39 41 40 40 - add_executable(color-test color/main.c ../demos/common/common.c ../demos/common/demo-font.c) 42 42 + add_executable(color-test color/main.c ${COMMON_SOURCE}) 41 43 target_link_libraries (color-test SDL_gpu) 42 44 43 43 - add_executable(mipmap-test mipmap/main.c ../demos/common/common.c ../demos/common/demo-font.c) 45 45 + add_executable(mipmap-test mipmap/main.c ${COMMON_SOURCE}) 44 46 target_link_libraries (mipmap-test SDL_gpu) 45 47 46 46 - add_executable(polygon-blit-test polygon-blit/main.c ../demos/common/common.c ../demos/common/demo-font.c) 48 48 + add_executable(polygon-blit-test polygon-blit/main.c ${COMMON_SOURCE}) 47 49 target_link_libraries (polygon-blit-test SDL_gpu) 48 50 49 49 - add_executable(camera-test camera/main.c ../demos/common/common.c ../demos/common/demo-font.c) 51 51 + add_executable(camera-test camera/main.c ${COMMON_SOURCE}) 50 52 target_link_libraries (camera-test SDL_gpu) 51 53 52 52 - add_executable(virtual-resolution-test virtual-resolution/main.c ../demos/common/common.c ../demos/common/demo-font.c) 54 54 + add_executable(virtual-resolution-test virtual-resolution/main.c ${COMMON_SOURCE}) 53 55 target_link_libraries (virtual-resolution-test SDL_gpu) 54 56 55 55 - add_executable(transformx-test transformx/main.c ../demos/common/common.c ../demos/common/demo-font.c) 57 57 + add_executable(transformx-test transformx/main.c ${COMMON_SOURCE}) 56 58 target_link_libraries (transformx-test SDL_gpu) 57 59 58 58 - add_executable(transform-matrix-test transform-matrix/main.c ../demos/common/common.c ../demos/common/demo-font.c) 60 60 + add_executable(transform-matrix-test transform-matrix/main.c ${COMMON_SOURCE}) 59 61 target_link_libraries (transform-matrix-test SDL_gpu) 60 62 61 61 - add_executable(copy-test copy/main.c ../demos/common/common.c ../demos/common/demo-font.c) 63 63 + add_executable(copy-test copy/main.c ${COMMON_SOURCE}) 62 64 target_link_libraries (copy-test SDL_gpu) 63 65 64 64 - add_executable(npot-test npot/main.c ../demos/common/common.c ../demos/common/demo-font.c) 66 66 + add_executable(npot-test npot/main.c ${COMMON_SOURCE}) 65 67 target_link_libraries (npot-test SDL_gpu) 66 68 67 67 - add_executable(features-test features/main.c ../demos/common/common.c ../demos/common/demo-font.c) 69 69 + add_executable(features-test features/main.c ${COMMON_SOURCE}) 68 70 target_link_libraries (features-test SDL_gpu) 69 71 70 70 - add_executable(save-test save/main.c ../demos/common/common.c ../demos/common/demo-font.c) 72 72 + add_executable(save-test save/main.c ${COMMON_SOURCE}) 71 73 target_link_libraries (save-test SDL_gpu) 72 74 73 73 - add_executable(shader-test shader/main.c ../demos/common/common.c ../demos/common/demo-font.c) 75 75 + add_executable(shader-test shader/main.c ${COMMON_SOURCE}) 74 76 target_link_libraries (shader-test SDL_gpu) 75 77 76 76 - add_executable(windows-test windows/main.c ../demos/common/common.c ../demos/common/demo-font.c) 78 78 + add_executable(windows-test windows/main.c ${COMMON_SOURCE}) 77 79 target_link_libraries (windows-test SDL_gpu) 78 80 79 79 - add_executable(windows2-test windows2/main.c ../demos/common/common.c ../demos/common/demo-font.c) 81 81 + add_executable(windows2-test windows2/main.c ${COMMON_SOURCE}) 80 82 target_link_libraries (windows2-test SDL_gpu) 81 83 82 82 - add_executable(shader-attributes-test shader-attributes/main.c ../demos/common/common.c ../demos/common/demo-font.c) 84 84 + add_executable(shader-attributes-test shader-attributes/main.c ${COMMON_SOURCE}) 83 85 target_link_libraries (shader-attributes-test SDL_gpu) 84 86 85 85 - add_executable(blit-batch-test blit-batch/main.c ../demos/common/common.c ../demos/common/demo-font.c) 87 87 + add_executable(blit-batch-test blit-batch/main.c ${COMMON_SOURCE}) 86 88 target_link_libraries (blit-batch-test SDL_gpu) 87 89 88 88 - add_executable(viewport-test viewport/main.c ../demos/common/common.c ../demos/common/demo-font.c) 90 90 + add_executable(viewport-test viewport/main.c ${COMMON_SOURCE}) 89 91 target_link_libraries (viewport-test SDL_gpu) 90 92 91 91 - add_executable(multitexture-test multitexture/main.c ../demos/common/common.c ../demos/common/demo-font.c) 93 93 + add_executable(multitexture-test multitexture/main.c ${COMMON_SOURCE}) 92 94 target_link_libraries (multitexture-test SDL_gpu) 93 95 94 94 - add_executable(intermediate-test intermediate/main.c ../demos/common/common.c ../demos/common/demo-font.c) 96 96 + add_executable(intermediate-test intermediate/main.c ${COMMON_SOURCE}) 95 97 target_link_libraries (intermediate-test SDL_gpu) 96 98 97 97 - add_executable(pixel-perfect-test pixel-perfect/main.c ../demos/common/common.c ../demos/common/demo-font.c) 99 99 + add_executable(pixel-perfect-test pixel-perfect/main.c ${COMMON_SOURCE}) 98 100 target_link_libraries (pixel-perfect-test SDL_gpu) 99 101 100 100 - add_executable(alias-test alias/main.c ../demos/common/common.c ../demos/common/demo-font.c) 102 102 + add_executable(alias-test alias/main.c ${COMMON_SOURCE}) 101 103 target_link_libraries (alias-test SDL_gpu) 102 104 103 103 - add_executable(triangle-batch-test triangle-batch/main.c ../demos/common/common.c ../demos/common/demo-font.c) 105 105 + add_executable(triangle-batch-test triangle-batch/main.c ${COMMON_SOURCE}) 104 106 target_link_libraries (triangle-batch-test SDL_gpu) 105 107 106 106 - add_executable(wrap-test wrap/main.c ../demos/common/common.c ../demos/common/demo-font.c) 108 108 + add_executable(wrap-test wrap/main.c ${COMMON_SOURCE}) 107 109 target_link_libraries (wrap-test SDL_gpu) 108 110 109 109 - add_executable(upload-image-test upload-image/main.c ../demos/common/common.c ../demos/common/demo-font.c) 111 111 + add_executable(upload-image-test upload-image/main.c ${COMMON_SOURCE}) 110 112 target_link_libraries (upload-image-test SDL_gpu) 111 113 112 112 - add_executable(image-formats-test image-formats/main.c ../demos/common/common.c ../demos/common/demo-font.c) 114 114 + add_executable(image-formats-test image-formats/main.c ${COMMON_SOURCE}) 113 115 target_link_libraries (image-formats-test SDL_gpu) 114 116 115 115 - add_executable(sandbox-test sandbox/main.c ../demos/common/common.c ../demos/common/demo-font.c) 117 117 + add_executable(sandbox-test sandbox/main.c ${COMMON_SOURCE}) 116 118 target_link_libraries (sandbox-test SDL_gpu) 117 119 118 118 - add_executable(renderer-test renderer/main.c ../demos/common/common.c) 120 120 + add_executable(renderer-test renderer/main.c ${COMMON_SOURCE}) 119 121 target_link_libraries (renderer-test SDL_gpu) 120 122 121 121 - add_executable(video-test video/main.c ../demos/common/common.c ../demos/common/demo-font.c) 123 123 + add_executable(video-test video/main.c ${COMMON_SOURCE}) 122 124 target_link_libraries (video-test SDL_gpu)

+1 -1

tests/renderer/main.c

reviewed

··· 737 737 } 738 738 739 739 740 740 - static void TriangleBatch(GPU_Renderer* renderer, GPU_Image* image, GPU_Target* target, unsigned short num_vertices, float* values, unsigned int num_indices, unsigned short* indices, GPU_BlitFlagEnum flags) 740 740 + static void TriangleBatch(GPU_Renderer* renderer, GPU_Image* image, GPU_Target* target, unsigned short num_vertices, float* values, unsigned int num_indices, unsigned short* indices, GPU_BatchFlagEnum flags) 741 741 { 742 742 GPU_Log(" %s (dummy)\n", __func__); 743 743 }

+5 -3

tools/CMakeLists.txt

reviewed

··· 1 1 include_directories (${SDL_gpu_SOURCE_DIR}) 2 2 - include_directories (${SDL_gpu_SOURCE_DIR}/demos/common) 2 2 + include_directories (${SDL_gpu_SOURCE_DIR}/common) 3 3 4 4 - add_executable(compare-images compare-images-src/main.c ${SDL_gpu_SOURCE_DIR}/demos/common/common.c) 4 4 + set(COMMON_SOURCE ${SDL_gpu_SOURCE_DIR}/common/common.c ${SDL_gpu_SOURCE_DIR}/common/demo-font.c) 5 5 + 6 6 + add_executable(compare-images compare-images-src/main.c ${COMMON_SOURCE}) 5 7 target_link_libraries (compare-images SDL_gpu) 6 8 7 7 - add_executable(thumb-viewer thumb-viewer-src/main.c ${SDL_gpu_SOURCE_DIR}/demos/common/common.c) 9 9 + add_executable(thumb-viewer thumb-viewer-src/main.c ${COMMON_SOURCE}) 8 10 target_link_libraries (thumb-viewer SDL_gpu)

+2 -2

tools/compare-images-src/main.c

reviewed

··· 1 1 #include "SDL.h" 2 2 #include "SDL_gpu.h" 3 3 #include <math.h> 4 4 - #include "../../demos/common/compat.h" 5 5 - #include "../../demos/common/common.h" 4 4 + #include "compat.h" 5 5 + #include "common.h" 6 6 7 7 #define PI 3.14159265359 8 8

+2 -2

tools/thumb-viewer-src/main.c

reviewed

··· 1 1 #include "SDL.h" 2 2 #include "SDL_gpu.h" 3 3 #include <math.h> 4 4 - #include "../../demos/common/compat.h" 5 5 - #include "../../demos/common/common.h" 4 4 + #include "compat.h" 5 5 + #include "common.h" 6 6 7 7 8 8 int main(int argc, char* argv[])