[what] 适配 Windows 编译

Author: HR1025

.github/workflows/ci.yml

@@ -15,4 +15,22 @@ jobs:
       - run : rm -rf build
       - run : mkdir build
       - run : git submodule update --init --recursive
-      - run : cd build && cmake .. -DUSE_OPENGL=ON -DUSE_GBM=ON -DUSE_SDL=ON -DUSE_SPRIV_CROSS=ON -DUSE_VULKAN=ON -DUSE_X11=ON -DUSE_VAAPI=ON -DUSE_OPENH264=ON && make -j4
+      - run : cd build && cmake .. -DUSE_OPENGL=ON -DUSE_GBM=ON -DUSE_SDL=ON -DUSE_SPRIV_CROSS=ON -DUSE_VULKAN=ON -DUSE_X11=ON -DUSE_VAAPI=ON -DUSE_OPENH264=ON && make -j4
+
+  msvc2022-x64-make:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v1
+      - run : git submodule update --init --recursive
+      - run : mkdir build
+      - run : cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S. -B./build -G "Visual Studio 17 2022" -T host=x64 -A x64
+      - run : cmake --build build --config Release -j 16
+
+  msvc2022-x86-make:
+    runs-on: windows-2022
+    steps:
+      - uses: actions/checkout@v1
+      - run : git submodule update --init --recursive
+      - run : mkdir build
+      - run : cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S. -B./build -G "Visual Studio 17 2022" -T host=x86 -A win32
+      - run : cmake --build build --config Release -j 16

.vscode/launch.json

@@ -2,7 +2,7 @@
     "version": "0.2.0",
     "configurations": [
         {
-            "name": "test_gl_compositor",
+            "name": "test_gl_compositor(debian)",
             "type": "cppdbg",
             "request": "launch",
             "program": "${workspaceFolder}/build/test_gl_compositor",
@@ -20,6 +20,17 @@
                     "ignoreFailures": true
                 }
             ]
+        },
+        {
+            "name": "test_gl_compositor(msvc)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "${workspaceFolder}/build/Debug/test_gl_compositor.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${fileDirname}",
+            "environment": [],
+            "console":"integratedTerminal"
         }
     ]
 }

CMakeLists.txt

@@ -16,6 +16,7 @@ list(APPEND MMP_SAMPLE_SRCS
     ${CMAKE_CURRENT_SOURCE_DIR}/source/PngB.c
     ${CMAKE_CURRENT_SOURCE_DIR}/source/AbstractDisplay.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/source/SampleUtils.cpp
+    ${CMAKE_CURRENT_SOURCE_DIR}/source/DisplaySDL.cpp
 )
 
 list(APPEND MMP_SAMPLE_LIBS
@@ -27,25 +28,10 @@ list(APPEND MMP_SAMPLE_LIBS
     Mmp::Windows 
     Mmp::PG 
     Mmp::SL
+    SDL2::SDL2 
+    SDL2::SDL2main
 )
 
-if (NOT SDL2_FOUND)
-    find_package(SDL2 CONFIG)
-endif()
-
-if (SDL2_FOUND)
-    message("-- Found SDL2")
-    message("  -- SDL INCS : ${SDL2_INCLUDE_DIRS}")
-    message("  -- SDL LIB DIR : ${SDL2_LIBRARY_DIRS}")
-    message("  -- SDL LIBS : ${SDL2_LIBRARIES}")
-    list(APPEND MMP_SAMPLE_INCS ${SDL2_INCLUDE_DIRS})
-    list(APPEND MMP_SAMPLE_SRCS
-        ${CMAKE_CURRENT_SOURCE_DIR}/source/DisplaySDL.cpp
-    )
-    list(APPEND MMP_SAMPLE_LIBS ${SDL2_LIBRARIES})
-    add_definitions(-DSAMPLE_WITH_SDL)
-endif()
-
 add_subdirectory(Core)
 
 add_executable(test_gl_compositor ${MMP_SAMPLE_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/test_gl_compositor.cpp)

Core

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 MMP. All Rights Reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

LICENSE

@@ -17,13 +17,35 @@
 ### Linux (Debian System)
 
 ```shell
-sudo apt install libgbm-dev libsdl2-dev libgl1-mesa-dev* nasm libx11-dev libdrm-dev libva-dev
+sudo apt install libgbm-dev libgl1-mesa-dev* nasm libx11-dev libdrm-dev libva-dev
 rm -rf build
 mkdir build
 git submodule update --init --recursive
 cd build && cmake .. -DUSE_OPENGL=ON -DUSE_GBM=ON -DUSE_SDL=ON -DUSE_SPRIV_CROSS=ON -DUSE_VULKAN=ON -DUSE_X11=ON -DUSE_VAAPI=ON -DUSE_OPENH264=ON && make -j4
 ```
 
+## Windows (MSVC 2022 x64)
+
+```shell
+git submodule update --init --recursive
+mkdir build
+cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S. -B./build -G "Visual Studio 17 2022" -T host=x86 -A win32
+cmake --build build --config Release -j 16
+```
+
+## Windows (MSVC 2022 x86)
+
+```shell
+git submodule update --init --recursive
+mkdir build
+cmake --no-warn-unused-cli -DCMAKE_EXPORT_COMPILE_COMMANDS:BOOL=TRUE -S. -B./build -G "Visual Studio 17 2022" -T host=x64 -A x64
+cmake --build build --config Release -j 16
+```
+
+>
+> `Windows` 也可以直接使用 `IDE` 进行构建, 在构建时选择对应的工具链即可.
+>
+
 ## 如何调试
 
 选择一个能与 `CMake` 结合的 `IDE` 工具即可, `demo` 附带了 `vscode` 使用的 `launch.json`.
@@ -32,7 +54,7 @@ cd build && cmake .. -DUSE_OPENGL=ON -DUSE_GBM=ON -DUSE_SDL=ON -DUSE_SPRIV_CROSS
 
 >
 > 详细的配置可以通过 `-h` 进行查看.
->  
+>
 
 ### test_gl_compositor
 

README.md

@@ -2,9 +2,7 @@
 
 #include <vector>
 
-#ifdef SAMPLE_WITH_SDL
-    #include "DisplaySDL.h"
-#endif /* SAMPLE_WITH_SDL */
+#include "DisplaySDL.h"
 
 namespace Mmp
 {
@@ -30,12 +28,10 @@ AbstractDisplay::ptr AbstractDisplay::Create(const std::string& className)
         }
         return display;
     }
-#ifdef SAMPLE_WITH_SDL
     else if (className == "DisplaySDL")
     {
         return std::make_shared<DisplaySDL>();
     }
-#endif /* SAMPLE_WITH_SDL */
     else
     {
         return nullptr;

source/AbstractDisplay.cpp

@@ -136,7 +136,7 @@ bool DisplaySDL::Open(PixelsInfo info)
         DISPLAY_LOG_ERROR << "Create SDL window fail, error is: " << SDL_GetError();
         return false;
     }
-    _render = SDL_CreateRenderer(_window, -1, SDL_RENDERER_SOFTWARE | SDL_RENDERER_TARGETTEXTURE);
+    _render = SDL_CreateRenderer(_window, -1,  SDL_RENDERER_TARGETTEXTURE);
     if (_render != nullptr)
     {
         DISPLAY_LOG_INFO << "Create SDL render Successfully";

source/DisplaySDL.cpp

@@ -135,6 +135,7 @@ void App::HandleDuration(const std::string& name, const std::string& value)
 
 void App::Initialize()
 {
+    ThreadPool::ThreadPoolSingleton()->Init();
     Codec::CodecConfig::Instance()->Init();
     {
         _renderThread = std::thread([this]() -> void
@@ -184,6 +185,7 @@ void App::Uninitialize()
         _renderThread.join();
     }
     Codec::CodecConfig::Instance()->Uninit();
+    ThreadPool::ThreadPoolSingleton()->Uninit();
 }
 
 void App::defineOptions(OptionSet& options)
@@ -289,7 +291,8 @@ int App::main(const ArgVec& args)
         Gpu::Update2DTextures(GLDrawContex::Instance(), std::vector<Texture::ptr>({imageB}), sceneB);
     }
 
-    auto equalSplitScreen = [&](size_t count, size_t fps, uint32_t duration) -> void
+    Promise<void>::ptr lastDraw;
+    auto equalSplitScreen = [&](size_t count, size_t fps, uint64_t duration) -> void
     {
         Gpu::AbstractSceneLayer::ptr layer = Gpu::AbstractSceneLayer::Create();
         std::vector<Gpu::SceneItemParam> params;
@@ -362,19 +365,31 @@ int App::main(const ArgVec& args)
                 itemParamOffset++;
             }
             layer->Draw(framebuffer);
-            Gpu::Copy2DTexturesToMemory(GLDrawContex::Instance(), std::vector<Texture::ptr>({framebuffer}), fb);
-            if (display)
+            if (lastDraw)
             {
-                display->UpdateWindow((const uint32_t*)(fb->GetData()), info);
+                lastDraw->Wait();
             }
-            curDrawTime++;
+            Gpu::Copy2DTexturesToMemory(GLDrawContex::Instance(), std::vector<Texture::ptr>({framebuffer}), fb);
             if (stamp.elapsed()/1000 > 1000 / fps)
             {
                 MMP_LOG_WARN << "overload, cost time is: " << stamp.elapsed()/1000 << " ms";
             }
+            lastDraw = std::make_shared<Promise<void>>([display, fb, info]()
+            {
+                if (display)
+                {
+                    display->UpdateWindow((const uint32_t*)(fb->GetData()), info);
+                }
+            });
+            ThreadPool::ThreadPoolSingleton()->Commit(lastDraw);
+            curDrawTime++;
             std::this_thread::sleep_for(std::chrono::milliseconds(1000 / fps - stamp.elapsed()/1000));
         }
         layer.reset();
+        if (lastDraw)
+        {
+            lastDraw->Wait();
+        }
     };
 
     equalSplitScreen(splitNum, fps, duration);