Skip to content

Commit

Permalink
Core: Merging experimental branch (Vulkan backend, various new API fo…
Browse files Browse the repository at this point in the history
…r plugins) (#741)

Co-authored-by: Steven Johnson <steve@xibalbastudios.com>
  • Loading branch information
Shchvova and ggcrunchy authored Nov 29, 2024
1 parent e3e659e commit b951bf5
Show file tree
Hide file tree
Showing 273 changed files with 197,740 additions and 16,487 deletions.
56 changes: 1 addition & 55 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,6 @@ on:
description: 'Build Year'
required: true
default: '2100'
onlyLatest:
description: "Only Latest Xcode"
type: 'boolean'
required: false
default: false


env:
Expand All @@ -31,7 +26,7 @@ env:
jobs:
source-code:
name: Check out and process source code
runs-on: macos-12
runs-on: macos-13
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- uses: actions/checkout@v4
Expand Down Expand Up @@ -116,7 +111,6 @@ jobs:


Xcode-template-matrix-13:
if: (! github.event.inputs.onlyLatest)
strategy:
matrix:
runner:
Expand Down Expand Up @@ -158,57 +152,9 @@ jobs:
name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }}
path: ./output

Xcode-template-matrix-12:
if: (! github.event.inputs.onlyLatest)
strategy:
matrix:
runner:
- macos-12
xcode:
- Xcode_13.2.1
- Xcode_14.2
target:
- template
- template-angle
platform:
- iphone
- tvos
needs: source-code
runs-on: ${{ matrix.runner }}
env:
DEVELOPER_DIR: /Applications/${{ matrix.xcode }}.app/Contents/Developer
TEMPLATE_TARGET: ${{ matrix.target }}
TEMPLATE_PLATFORM: ${{ matrix.platform }}
S2D_MIN_VER_IOS: "8.0"
S2D_MIN_VER_TVOS: "9.0"
S2D_MIN_VER_MACOS: "10.9"
steps:
- run: CDR="$(basename "$(pwd)")" ; cd .. ; rm -rf "$CDR" ; mkdir -p "$CDR" ; cd "$CDR"
- name: Get processed code
uses: actions/download-artifact@v4
with:
name: SourceCode
path: SourceCode
- name: Unpack source code
run: tar -xzf SourceCode/corona.tgz
- run: ./tools/GHAction/daily_env.sh
- name: Build templates
working-directory: ./platform/${{ matrix.platform }}
run: ./gh_build_templates.sh
env:
CERT_PASSWORD: ${{ secrets.CertPassword }}
- name: Build templates JSON spec
run: ./tools/GHAction/generate_xcode_jsons.py
- name: Upload templates
uses: actions/upload-artifact@v4
with:
name: Templates-${{ matrix.platform }}-${{ matrix.xcode }}-${{ matrix.target }}
path: ./output


collect-ios-templates:
needs:
- Xcode-template-matrix-12
- Xcode-template-matrix-13
- Xcode-template-matrix-14
runs-on: ubuntu-20.04
Expand Down
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,8 @@ premake4.lua
librtt/Renderer/ios/build
librtt/Renderer/mac/build

#large file
external/vulkan/Lib32/shaderc_combinedd.lib

#legacy entries
/plugins/viewer
Expand Down
3 changes: 2 additions & 1 deletion external/ALmixer/Isolated/DirectX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@ DEFINE_ENUM_FLAG_OPERATORS(SoundDecoder_SampleFlags)
static std::recursive_mutex sMutex;

/// <summary>Stores a set of each thread ID this module has initialized Microsoft COM on.</summary>
static std::unordered_set<std::thread::id> sComInitializedThreadIdSet;
static std::unordered_set<std::thread::id> sComInitializedThreadIdSet; // This is a false positive (several, rather) for memory leaks:
// the report occurs before static deinitialization / DLL detach

/// <summary>
/// <para>Set true if the DirectX Media Foundation's MFStartup() function was called.</para>
Expand Down
2 changes: 2 additions & 0 deletions external/openal-soft-1.12.854/Alc/alcConfig.c
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,8 @@ void ReadALConfig(void)

void FreeALConfig(void)
{
// N.B. these give us false positives for memory leaks: the report
// occurs before the DLLMain() that calls this function.
size_t i;

for(i = 0;i < cfgCount;i++)
Expand Down
Loading

0 comments on commit b951bf5

Please sign in to comment.