Use gcc-10 in linux workflow

Link with -ldl on linux
shader-slang · Feb 13, 2024 · bf4d8a3 · bf4d8a3
1 parent 40db068
commit bf4d8a3
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 13 deletions.
diff --git a/.github/workflows/linux-x86_64.yml b/.github/workflows/linux-x86_64.yml
@@ -9,9 +9,20 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
+    - name: select gcc 10
+      run: |
+        sudo update-alternatives \
+            --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+            --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \
+            --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \
+            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \
+            --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
+            --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
+            --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
     - uses: actions/checkout@v3
     - name: Install prerequisite
       run: sudo apt-get install ninja-build

diff --git a/.github/workflows/release-linux.yml b/.github/workflows/release-linux.yml
@@ -9,9 +9,20 @@ on:
 jobs:
   build:
 
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
 
     steps:
+    - name: select gcc 10
+      run: |
+        sudo update-alternatives \
+            --install /usr/bin/gcc gcc /usr/bin/gcc-10 100 \
+            --slave /usr/bin/g++ g++ /usr/bin/g++-10 \
+            --slave /usr/bin/gcc-ar gcc-ar /usr/bin/gcc-ar-10 \
+            --slave /usr/bin/gcc-nm gcc-nm /usr/bin/gcc-nm-10 \
+            --slave /usr/bin/gcc-ranlib gcc-ranlib /usr/bin/gcc-ranlib-10 \
+            --slave /usr/bin/gcov gcov /usr/bin/gcov-10 \
+            --slave /usr/bin/gcov-dump gcov-dump /usr/bin/gcov-dump-10 \
+            --slave /usr/bin/gcov-tool gcov-tool /usr/bin/gcov-tool-10
     - uses: actions/checkout@v3
     - name: Install prerequisite
       run: sudo apt-get install ninja-build

diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt
@@ -117,6 +117,7 @@ target_link_libraries(falcor_perftest
     PUBLIC
         slang slang-gfx
         external_includes
+        $<$<PLATFORM_ID:Linux>:dl>
 )
 
 set_target_properties(falcor_perftest PROPERTIES

diff --git a/source/DeviceWrapper.cpp b/source/DeviceWrapper.cpp
@@ -3,6 +3,7 @@
 
 Device::Device()
 {
+    printf("slang: create global session\n");
     slang::createGlobalSession(m_slangGlobalSession.writeRef());
     m_pProgramManager = std::make_unique<ProgramManager>(this);
 
@@ -12,15 +13,7 @@ Device::Device()
     gfxDesc.shaderCache.maxEntryCount = 1000;
     gfxDesc.shaderCache.shaderCachePath = nullptr;
 
-    std::vector<void*> extendedDescs;
-    // Add extended desc for root parameter attribute.
-    gfx::D3D12DeviceExtendedDesc extDesc = {};
-    extDesc.rootParameterShaderAttributeName = "root";
-    extendedDescs.push_back(&extDesc);
-
-    gfxDesc.extendedDescCount = extendedDescs.size();
-    gfxDesc.extendedDescs = extendedDescs.data();
-
+    printf("gfx:: get GPU adapters\n");
     gfx::AdapterList adapters = gfx::gfxGetAdapters(gfxDesc.deviceType);
     if (adapters.getCount() == 0)
     {
@@ -33,6 +26,7 @@ Device::Device()
     mpAPIDispatcher.reset(new PipelineCreationAPIDispatcher());
     gfxDesc.apiCommandDispatcher = static_cast<ISlangUnknown*>(mpAPIDispatcher.get());
 
+    printf("gfx create device\n");
     if (SLANG_FAILED(gfx::gfxCreateDevice(&gfxDesc, m_gfxDevice.writeRef())))
     {
         printf("Failed to create device on GPU 0 (%s).", adapters.getAdapters()[0].name);

diff --git a/source/main.cpp b/source/main.cpp
@@ -128,8 +128,9 @@ void TestCase(ref<Device>& device)
 
 int main(int argc, char* argv[])
 {
-    ref<Device> device = make_ref<Device>();
-    TestCase(device);
+    printf("Starting creating device\n");
+    // ref<Device> device = make_ref<Device>();
+    // TestCase(device);
 
     return 0;
 }