Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bgfx sys 0.16 #9

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Bgfx sys 0.16 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
db7e679
moving to 0.16
Abhinavpatel00 Dec 19, 2024
d66539f
moving to 0.16
Abhinavpatel00 Dec 19, 2024
502cf6d
ok
Abhinavpatel00 Dec 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 1 addition & 2 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@ web_example/target/
web_example/static/web_example.d
web_example/static/web_example.js
web_example/static/web_example.wasm

# Remove Cargo.lock from gitignore if creating an executable, leave it for libraries
# More information here https://doc.rust-lang.org/cargo/guide/cargo-toml-vs-cargo-lock.html
Cargo.lock

.gdb_history
# These are backup files generated by rustfmt
**/*.rs.bk
2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ repository = "https://github.com/emoon/bgfx-sys"
documentation = "https://docs.rs/bgfx-sys/0.14/bgfx-sys"
readme = "readme.md"
name = "bgfx-sys"
version = "0.15.0"
version = "0.16.0"
edition = "2018"
build = "build.rs"

Expand Down
106 changes: 35 additions & 71 deletions bgfx/.github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,25 +14,25 @@ jobs:
fail-fast: true
matrix:
include: [
{ config: Debug, platform: Win32, bindir: 'win32_vs2019' },
{ config: Debug, platform: x64, bindir: 'win64_vs2019' },
{ config: Release, platform: Win32, bindir: 'win32_vs2019' },
{ config: Release, platform: x64, bindir: 'win64_vs2019' },
{ config: Debug, platform: Win32, bindir: 'win32_vs2022' },
{ config: Debug, platform: x64, bindir: 'win64_vs2022' },
{ config: Release, platform: Win32, bindir: 'win32_vs2022' },
{ config: Release, platform: x64, bindir: 'win64_vs2022' },
]
name: msvc-${{ matrix.config }}-${{ matrix.platform }}
runs-on: windows-2019
runs-on: windows-2022
steps:
- name: Checkout bgfx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bimg
path: bimg
Expand All @@ -42,8 +42,8 @@ jobs:
shell: cmd
run: |
cd bgfx
..\bx\tools\bin\windows\genie.exe --with-tools --with-combined-examples --with-shared-lib vs2019
msbuild ".build/projects/vs2019/bgfx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
..\bx\tools\bin\windows\genie.exe --with-tools --with-combined-examples --with-shared-lib vs2022
msbuild ".build/projects/vs2022/bgfx.sln" /m /v:minimal /p:Configuration=${{ matrix.config }} /p:Platform=${{ matrix.platform }}
- name: Check
shell: cmd
run: |
Expand All @@ -58,22 +58,22 @@ jobs:
matrix:
include: [
{ msystem: MINGW64, project: 'mingw-gcc', bindir: 'win64_mingw-gcc' },
{ msystem: CLANG64, project: 'mingw-clang', bindir: 'win64_mingw-clang' },
# { msystem: CLANG64, project: 'mingw-clang', bindir: 'win64_mingw-clang' },
]
name: mingw-${{ matrix.msystem }}
runs-on: windows-latest
runs-on: windows-2022
steps:
- name: Checkout bgfx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bimg
path: bimg
Expand Down Expand Up @@ -105,71 +105,35 @@ jobs:
{ config: debug, binsuffix: Debug },
{ config: release, binsuffix: Release },
]
name: linux-${{ matrix.config }}64
runs-on: ubuntu-22.04
name: linux-gcc-${{ matrix.config }}64
runs-on: ubuntu-24.04
steps:
- name: Checkout bgfx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bimg
path: bimg
- name: Build
run: |
sudo apt install libgl-dev
cd bgfx
make -j$(nproc) linux-${{ matrix.config }}64
make -j$(nproc) linux-gcc-${{ matrix.config }}64
- name: Check
run: |
cd bgfx
ls -lash ".build/linux64_gcc/bin"
".build/linux64_gcc/bin/geometryc${{ matrix.binsuffix}}" --version
".build/linux64_gcc/bin/shaderc${{ matrix.binsuffix}}" --version
".build/linux64_gcc/bin/texturec${{ matrix.binsuffix}}" --version
wasm:
strategy:
fail-fast: true
matrix:
config: [ debug, release]
name: wasm-${{ matrix.config }}
runs-on: ubuntu-22.04
steps:
- name: Checkout bgfx
uses: actions/checkout@v3
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
with:
repository: bkaradzic/bimg
path: bimg
- name: Prepare
run: |
docker pull emscripten/emsdk
docker run --rm emscripten/emsdk which emcc em++ emar
cd bgfx
EMSCRIPTEN=/emsdk/upstream/emscripten ../bx/tools/bin/linux/genie --with-examples --gcc=wasm gmake
- name: Build
run: >
docker run --rm -u $(id -u):$(id -g) -v $(pwd):/bgfx emscripten/emsdk
make -C /bgfx/bgfx wasm-${{ matrix.config }} -j$(nproc) EMSCRIPTEN=/emsdk/upstream/emscripten
- name: Check
run: |
cd bgfx
ls -lash ".build/wasm/bin"
osx:
strategy:
fail-fast: true
Expand All @@ -178,34 +142,34 @@ jobs:
{ config: debug, binsuffix: Debug },
{ config: release, binsuffix: Release },
]
name: osx-x64-${{ matrix.config }}
runs-on: macos-latest
name: osx-arm64-${{ matrix.config }}
runs-on: macos-14
steps:
- name: Checkout bgfx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bimg
path: bimg
- name: Build
run: |
cd bgfx
make -j$(sysctl -n hw.physicalcpu) osx-x64-${{ matrix.config }}
make -j$(sysctl -n hw.physicalcpu) osx-arm64-${{ matrix.config }}
- name: Check
run: |
cd bgfx
ls -lash ".build/osx-x64/bin"
".build/osx-x64/bin/geometryc${{ matrix.binsuffix}}" --version
".build/osx-x64/bin/shaderc${{ matrix.binsuffix}}" --version
".build/osx-x64/bin/texturec${{ matrix.binsuffix}}" --version
ls -lash ".build/osx-arm64/bin"
".build/osx-arm64/bin/geometryc${{ matrix.binsuffix}}" --version
".build/osx-arm64/bin/shaderc${{ matrix.binsuffix}}" --version
".build/osx-arm64/bin/texturec${{ matrix.binsuffix}}" --version
android:
strategy:
fail-fast: true
Expand All @@ -214,24 +178,24 @@ jobs:
{ platform: arm64 },
]
name: android-${{ matrix.platform }}
runs-on: ubuntu-22.04
runs-on: ubuntu-24.04
steps:
- uses: nttld/setup-ndk@v1
id: setup-ndk
with:
ndk-version: r25b
add-to-path: false
- name: Checkout bgfx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
path: bgfx
- name: Checkout bx
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bx
path: bx
- name: Checkout bimg
uses: actions/checkout@v3
uses: actions/checkout@v4
with:
repository: bkaradzic/bimg
path: bimg
Expand Down
Loading
Loading