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.

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

build(deps): bump bimg from e9fa0ce to 2afa64c #72

Open
wants to merge 137 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
137 commits
Select commit Hold shift + click to select a range
9f2b580
Update bgfx and bx submodules
bghgary Jun 10, 2019
de88c82
Update .gitmodules to the right path
bghgary Jun 10, 2019
5f2f6d9
Removed IB-compress scripts from build system because IB-compress is …
syntheticmagus Jun 10, 2019
4d4d5b9
Update bgfx with 32 streams fix
bghgary Jul 1, 2019
0015484
First round of changes to support UWP: ZW compiler flag, _CRT_SECURE_…
syntheticmagus Aug 7, 2019
9a7ab94
Up-to-date merged version of BGFX.
syntheticmagus Aug 8, 2019
fa00b1f
Fixed wrong commit number for submodule.
syntheticmagus Aug 8, 2019
3a82a74
Re-enabled NVTT for UWP (successful building requires a bimg change, …
syntheticmagus Aug 8, 2019
ec91ee9
Merge branch 'master' of https://github.com/BabylonJS/bgfx.cmake
syntheticmagus Aug 8, 2019
25d023f
Added commits for arm fixes for bimg.
syntheticmagus Aug 9, 2019
25a603e
Updated submodule to consume BGFX WinRT fix.
syntheticmagus Aug 14, 2019
52ca95e
Added support for creating SRVs for typeless textures in D3D11.
syntheticmagus Sep 16, 2019
3117fb6
Merge branch 'master' of https://github.com/JoshuaBrookover/bgfx.cmake
CedricGuillemet Oct 1, 2019
9d93d66
Merge pull request #1 from BabylonJS/updatebgfxAndroidCI
CedricGuillemet Oct 2, 2019
0c0d575
repos update
CedricGuillemet Nov 25, 2019
93378f1
bgfx update
CedricGuillemet Nov 26, 2019
75875f8
Merge pull request #2 from CedricGuillemet/updateReposBabylon
CedricGuillemet Nov 26, 2019
7f70181
update bgfx
CedricGuillemet Apr 9, 2020
0fb4068
Merge pull request #3 from CedricGuillemet/updatebgfx
CedricGuillemet Apr 9, 2020
b5493bd
update bx
CedricGuillemet May 22, 2020
76c3ade
Merge pull request #4 from CedricGuillemet/updatebx
CedricGuillemet May 22, 2020
27b1598
update bimg
CedricGuillemet May 23, 2020
2c62796
Merge pull request #5 from CedricGuillemet/updatebimg
CedricGuillemet May 23, 2020
465ba5d
update bgfx
CedricGuillemet May 23, 2020
bbdfb47
Merge pull request #6 from CedricGuillemet/upgradebgfx
CedricGuillemet May 23, 2020
512127a
disable warning for bx
CedricGuillemet May 23, 2020
0d6bce2
Merge pull request #7 from CedricGuillemet/disablelink4264
CedricGuillemet May 23, 2020
b6795af
revert flag change
CedricGuillemet May 23, 2020
fab2e25
Merge pull request #8 from CedricGuillemet/revertChange
CedricGuillemet May 23, 2020
7825283
bx update
CedricGuillemet May 23, 2020
322b395
Merge pull request #9 from CedricGuillemet/simdupdate
CedricGuillemet May 23, 2020
2dfb00d
Consume new OpenGL shader processing change in bgfx.
syntheticmagus Jun 13, 2020
cf76bc4
Update bgfx
bghgary Jun 24, 2020
5f8f05b
update bgfx for metal reinit
CedricGuillemet Jul 23, 2020
4d22e1f
Merge pull request #11 from CedricGuillemet/updatebgfxreinit
CedricGuillemet Jul 23, 2020
93cd558
fix bxcheck
CedricGuillemet Jul 23, 2020
1025e50
Merge pull request #12 from BabylonJS/fixbccheck
CedricGuillemet Jul 23, 2020
7b1a202
update bgfx/bimg/bx
CedricGuillemet Oct 31, 2020
b175120
Merge pull request #14 from CedricGuillemet/updatebgfxLayoutLeaks
CedricGuillemet Oct 31, 2020
e70c465
update bgfx
CedricGuillemetMS Nov 13, 2020
d4c3577
Merge branch 'master' of https://github.com/BabylonJS/bgfx.cmake into…
CedricGuillemetMS Nov 13, 2020
56f14ff
Merge pull request #15 from CedricGuillemet/updabtegfxLayout2
CedricGuillemet Nov 13, 2020
40f2dd5
update
CedricGuillemetMS Nov 13, 2020
2e35b48
Merge branch 'master' of https://github.com/BabylonJS/bgfx.cmake into…
CedricGuillemetMS Nov 13, 2020
f41aef4
Merge pull request #16 from CedricGuillemet/updatelayout3
CedricGuillemet Nov 13, 2020
4844698
Update bgfx submodule to include fix to respect BGFX_RESET_FLIP_AFTER…
Alex-MSFT Dec 2, 2020
ff13f6a
Merge pull request #17 from Alex-MSFT/flip_after_render_fix
bghgary Dec 2, 2020
9fa9852
Update bgfx submodule to add new config to allow waiting to fully ren…
Alex-MSFT Dec 10, 2020
373fc6e
Merge pull request #18 from Alex-MSFT/ios_flicker_fix
bghgary Dec 10, 2020
aada777
update bgfx
CedricGuillemetMS Dec 17, 2020
826cfc8
Merge branch 'master' of https://github.com/BabylonJS/bgfx.cmake into…
CedricGuillemetMS Dec 17, 2020
d89fcd5
Merge pull request #19 from CedricGuillemet/updatebgfxBugFixes
CedricGuillemet Dec 17, 2020
4502ba7
add new cmake flag to avoid consuming windows runtime
Dec 18, 2020
46ce9c8
update cmake flags
Dec 18, 2020
9459306
remove windows runtime component
Dec 22, 2020
207564f
remove adding consume windows runtime flag
Dec 22, 2020
6b4e08f
update bgfx submodule commits to pick up uwp fixes
Jan 4, 2021
36bccc0
Merge pull request #20 from chrisfromwork/moreCmakeOptions
bghgary Jan 4, 2021
e5a7f97
move to babylonjs bgfx repo
Jan 6, 2021
ad45c8f
Merge pull request #21 from chrisfromwork/fixModules
bghgary Jan 6, 2021
05c51ad
Update BGFX to fix bug on reset
Alex-MSFT Jan 7, 2021
0aa774f
Merge pull request #22 from Alex-MSFT/fix_bgfx_reset
bghgary Jan 7, 2021
31d8257
Move bx onto an actual commit. It had been pointing at a (now delete…
Alex-MSFT Jan 7, 2021
a742b17
Merge pull request #23 from Alex-MSFT/fix_bad_bx_commit
Alex-MSFT Jan 7, 2021
fc5a75e
bgfx-update
bghgary Feb 18, 2021
1eb1955
bgfx update
bghgary Mar 7, 2021
3c6c3b7
Merge pull request #25 from bghgary/bgfx-update
bghgary Mar 7, 2021
75092e4
use custom branch
Mar 8, 2021
1552202
update submodule
Mar 10, 2021
a4aef68
Merge branch 'master' of https://github.com/BabylonJS/bgfx.cmake into…
Mar 10, 2021
d63cd5c
Merge pull request #26 from chrisfromwork/swapChainFix
bghgary Mar 10, 2021
e1f92a0
Update bgfx
Alex-MSFT May 6, 2021
f853f85
Update bgfx to the latest to include support for signed byte and usho…
Alex-MSFT May 11, 2021
864597b
Merge pull request #27 from Alex-MSFT/byte_and_ushort
Alex-MSFT May 11, 2021
b0a3848
Update BGFX
Alex-MSFT Jun 15, 2021
52c1388
Merge pull request #28 from Alex-MSFT/fix_buffer_overflow
bghgary Jun 16, 2021
2fb2b41
updatebgfx
CedricGuillemetMS Sep 23, 2021
4084ae4
Merge pull request #29 from CedricGuillemet/updateBgfx
CedricGuillemet Sep 23, 2021
1f9ee93
Merge branch 'master' of https://github.com/bkaradzic/bgfx.cmake into…
CedricGuillemetMS Sep 23, 2021
1b57432
Merge pull request #30 from CedricGuillemet/tinyExr
CedricGuillemet Sep 23, 2021
6acdd6e
Update bgfx
ryantrem Oct 4, 2021
66a57bf
Merge branch 'master' into shared-commandqueue
ryantrem Oct 4, 2021
d038e50
Merge pull request #33 from ryantrem/shared-commandqueue
bghgary Oct 5, 2021
77159c1
Merge branch 'master' of https://github.com/bkaradzic/bgfx.cmake into…
CedricGuillemetMS Nov 18, 2021
4982fdb
update bx & bimg
CedricGuillemetMS Nov 18, 2021
15e746f
tinyexr missing
CedricGuillemetMS Nov 18, 2021
b23eb00
Merge pull request #34 from CedricGuillemet/updatelatest
CedricGuillemet Nov 18, 2021
79f56a6
bgfx subrepo
CedricGuillemetMS Nov 18, 2021
71e3cbc
Merge pull request #35 from CedricGuillemet/bgfxSubRepo
CedricGuillemet Nov 18, 2021
b6e76ec
tiny exr install
CedricGuillemetMS Nov 18, 2021
d935df0
Merge pull request #36 from CedricGuillemet/tinyexrInstall
CedricGuillemet Nov 18, 2021
a8b0d4a
missing renderer
CedricGuillemetMS Nov 18, 2021
d70f87c
Merge pull request #37 from CedricGuillemet/bgfxMissingRenderer
CedricGuillemet Nov 18, 2021
d9353b4
bgfx update
CedricGuillemetMS Nov 19, 2021
e9c5c8b
Merge pull request #38 from CedricGuillemet/glesWrite
CedricGuillemet Nov 19, 2021
92c60a5
update bgfx d3d12
CedricGuillemetMS Dec 2, 2021
7b120b8
Merge pull request #39 from CedricGuillemet/updated3d12
CedricGuillemet Dec 2, 2021
805dbe2
Add option to use EGL targets for OpenGL
bghgary Dec 16, 2021
70d2998
Merge pull request #40 from bghgary/unix-egl
bghgary Dec 16, 2021
d3366b5
Completely remove examples when turned off
bghgary Jan 6, 2022
375fcd5
Merge pull request #41 from bghgary/examples-fix
bghgary Jan 6, 2022
a8c1907
Updated bgfx
SergioRZMasson Mar 4, 2022
3c1debc
Merge pull request #42 from SergioRZMasson/update-bgfx
bghgary Mar 4, 2022
8c91136
update submodules
CedricGuillemet Jun 14, 2022
2521037
Merge pull request #43 from CedricGuillemet/UpdateJune2022
CedricGuillemet Jun 14, 2022
593f417
fix attribTypeIsFloat
CedricGuillemet Jun 14, 2022
993d749
Merge pull request #44 from CedricGuillemet/fixattribTypeIsFloat
CedricGuillemet Jun 14, 2022
eec6b12
update bgfx submodule
CedricGuillemet Jun 22, 2022
bce6ab8
Merge pull request #45 from CedricGuillemet/update062222
CedricGuillemet Jun 22, 2022
97058c8
Merge branch 'master' of https://github.com/bkaradzic/bgfx.cmake into…
CedricGuillemet Jun 22, 2022
f0ee1a4
fix windows build
CedricGuillemet Jun 22, 2022
dc4ce00
Merge pull request #46 from CedricGuillemet/updateSolution
CedricGuillemet Jun 22, 2022
c937a01
Update bgfx with WinRT fixes
bghgary Jun 24, 2022
23c5534
Merge pull request #47 from bghgary/update-bgfx
bghgary Jun 24, 2022
9854e62
Merge branch 'master' of https://github.com/bkaradzic/bgfx.cmake into…
CedricGuillemet Jul 19, 2022
4c33392
bgfx update
CedricGuillemet Jul 19, 2022
c0b917e
Merge pull request #49 from CedricGuillemet/premulUpdate
CedricGuillemet Jul 19, 2022
c4f8073
fix conflict
CedricGuillemet Jul 19, 2022
6b115b7
Merge pull request #50 from CedricGuillemet/fixConflict
CedricGuillemet Jul 19, 2022
3e91e0a
update bgfx
CedricGuillemet Aug 4, 2022
c02ae74
Merge pull request #52 from CedricGuillemet/updt080422
CedricGuillemet Aug 4, 2022
53f94f5
bump submodules
CedricGuillemet Oct 6, 2022
a1fb208
Merge branch 'master' of https://github.com/bkaradzic/bgfx.cmake into…
CedricGuillemet Oct 6, 2022
7a655e5
Merge pull request #57 from CedricGuillemet/update100622
CedricGuillemet Oct 6, 2022
16d0454
Update to latest bgfx submodules
bghgary Dec 1, 2022
67efc9f
Merge pull request #62 from bghgary/update-latest
bghgary Dec 1, 2022
f8f58aa
Update bgfx
bghgary Dec 1, 2022
14dfea2
Update bgfx to latest with WinUI3 support
bghgary Mar 3, 2023
863f595
Update bx and bimg to match latest bgfx
bghgary Mar 3, 2023
e78bc2e
Update submodules bgfx, bimg and bx to get bgfx clear rect fix
docEdub Jun 24, 2023
b133fef
Update submodule bgfx to fix Apple build on old versions of Xcode
docEdub Jul 19, 2023
3274a0b
Merge pull request #67 from docEdub/230718-fix-apple-build-on-old-xcode
docEdub Jul 19, 2023
3494db1
fix BX_CONFIG_DEBUG flag
CedricGuillemet Feb 5, 2024
756234e
Merge pull request #68 from CedricGuillemet/bx_config_debug
CedricGuillemet Feb 5, 2024
682daf2
Update to latest submodules
bghgary May 3, 2024
345e3e2
Merge pull request #69 from bghgary/update
bghgary May 3, 2024
98bdf46
build(deps): bump bimg from `e9fa0ce` to `2afa64c`
dependabot[bot] Jul 1, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2
updates:
- package-ecosystem: "gitsubmodule"
directory: "/"
schedule:
interval: "monthly"
version: 2
updates:
- package-ecosystem: "gitsubmodule"
directory: "/"
schedule:
interval: "monthly"
58 changes: 0 additions & 58 deletions .github/workflows/ci.yml

This file was deleted.

200 changes: 100 additions & 100 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
@@ -1,100 +1,100 @@
# https://github.com/openblack/bgfx.cmake/blob/master/.github/workflows/release.yml
name: Release
on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
jobs:
version:
name: version
runs-on: ubuntu-latest
outputs:
revision: ${{ steps.version.outputs.revision }}
sha: ${{ steps.version.outputs.sha }}
tag: ${{ steps.version.outputs.tag }}
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- id: version
run: |
API_VERSION=$(grep -Eo "BGFX_API_VERSION UINT32_C\([0-9]+\)" bgfx/include/bgfx/defines.h | grep -Eo "[0-9]+" | tail -1)
REVISION=$(cd bgfx && git rev-list HEAD --count)
SHA=$(cd bgfx && git rev-parse HEAD)
SHA7="${GITHUB_SHA::7}"
TAG="v1.${API_VERSION}.${REVISION}-${SHA7}"
echo "::set-output name=revision::${REVISION}"
echo "::set-output name=sha::${SHA}"
echo "::set-output name=tag::${TAG}"
build:
name: ${{ matrix.os }}
needs: [ version ]
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
- os: ubuntu-latest
- os: macos-latest
env:
# Indicates the CMake build directory where project files and binaries are being produced.
CMAKE_BUILD_DIR: ${{ github.workspace }}/build/
CMAKE_INSTALL_DIR: ${{ github.workspace }}/install/
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt install -y libgl1-mesa-dev
if: matrix.os == 'ubuntu-latest'
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
- uses: lukka/get-cmake@latest
# On Windows runners, let's ensure to have the Developer Command Prompt environment setup correctly. As used here the Developer Command Prompt created is targeting x64 and using the default the Windows SDK.
- uses: ilammy/msvc-dev-cmd@v1
# Update version
- name: Update version.h
run: |
sed "s/ BGFX_REV_NUMBER .*/ BGFX_REV_NUMBER ${{ needs.version.outputs.revision }}/g" bgfx/src/version.h > version.tmp && mv version.tmp bgfx/src/version.h
sed "s/ BGFX_REV_SHA1 .*/ BGFX_REV_SHA1 \"${{ needs.version.outputs.sha }}\"/g" bgfx/src/version.h > version.tmp && mv version.tmp bgfx/src/version.h
shell: bash
# Run CMake to generate project files
- name: Generate project files
run: |
cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON -DCMAKE_BUILD_TYPE=Release
# Build the install targets
- name: Build
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.os }}
path: ${{ github.workspace }}/install/
release:
name: release
runs-on: ubuntu-latest
needs: [ version, build ]
if: github.repository == 'bkaradzic/bgfx.cmake' && github.event_name == 'push'
steps:
- name: Create Release
uses: actions/create-release@v1
with:
tag_name: ${{ needs.version.outputs.tag }}
release_name: ${{ needs.version.outputs.tag }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# https://github.com/openblack/bgfx.cmake/blob/master/.github/workflows/release.yml

name: Release

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]

jobs:

version:
name: version
runs-on: ubuntu-latest
outputs:
revision: ${{ steps.version.outputs.revision }}
sha: ${{ steps.version.outputs.sha }}
tag: ${{ steps.version.outputs.tag }}
steps:
- uses: actions/checkout@v2
with:
submodules: recursive
fetch-depth: 0
- id: version
run: |
API_VERSION=$(grep -Eo "BGFX_API_VERSION UINT32_C\([0-9]+\)" bgfx/include/bgfx/defines.h | grep -Eo "[0-9]+" | tail -1)
REVISION=$(cd bgfx && git rev-list HEAD --count)
SHA=$(cd bgfx && git rev-parse HEAD)
SHA7="${GITHUB_SHA::7}"
TAG="v1.${API_VERSION}.${REVISION}-${SHA7}"
echo "::set-output name=revision::${REVISION}"
echo "::set-output name=sha::${SHA}"
echo "::set-output name=tag::${TAG}"

build:
name: ${{ matrix.os }}
needs: [ version ]
runs-on: ${{ matrix.os }}
strategy:
fail-fast: false
matrix:
include:
- os: windows-latest
- os: ubuntu-latest
- os: macos-latest

env:
# Indicates the CMake build directory where project files and binaries are being produced.
CMAKE_BUILD_DIR: ${{ github.workspace }}/build/
CMAKE_INSTALL_DIR: ${{ github.workspace }}/install/

steps:
- uses: actions/checkout@v2
with:
submodules: recursive
- name: Install Linux dependencies
run: |
sudo apt-get update
sudo apt install -y libgl1-mesa-dev
if: matrix.os == 'ubuntu-latest'
# Setup the build machine with the most recent versions of CMake and Ninja. Both are cached if not already: on subsequent runs both will be quickly restored from GitHub cache service.
- uses: lukka/get-cmake@latest

# On Windows runners, let's ensure to have the Developer Command Prompt environment setup correctly. As used here the Developer Command Prompt created is targeting x64 and using the default the Windows SDK.
- uses: ilammy/msvc-dev-cmd@v1

# Update version
- name: Update version.h
run: |
sed "s/ BGFX_REV_NUMBER .*/ BGFX_REV_NUMBER ${{ needs.version.outputs.revision }}/g" bgfx/src/version.h > version.tmp && mv version.tmp bgfx/src/version.h
sed "s/ BGFX_REV_SHA1 .*/ BGFX_REV_SHA1 \"${{ needs.version.outputs.sha }}\"/g" bgfx/src/version.h > version.tmp && mv version.tmp bgfx/src/version.h
shell: bash

# Run CMake to generate project files
- name: Generate project files
run: |
cmake -B "${{ env.CMAKE_BUILD_DIR }}" -DCMAKE_INSTALL_PREFIX="${{ env.CMAKE_INSTALL_DIR }}" -DCMAKE_DEBUG_POSTFIX=d -DBGFX_BUILD_EXAMPLES=OFF -DBGFX_BUILD_TOOLS=ON -DBGFX_INSTALL=ON -DBGFX_AMALGAMATED=ON -DCMAKE_BUILD_TYPE=Release
# Build the install targets
- name: Build
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
- uses: actions/upload-artifact@v2
with:
name: ${{ matrix.os }}
path: ${{ github.workspace }}/install/

release:
name: release
runs-on: ubuntu-latest
needs: [ version, build ]
if: github.repository == 'bkaradzic/bgfx.cmake' && github.event_name == 'push'
steps:
- name: Create Release
uses: actions/create-release@v1
with:
tag_name: ${{ needs.version.outputs.tag }}
release_name: ${{ needs.version.outputs.tag }}
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[submodule "bgfx"]
path = bgfx
url = https://github.com/bkaradzic/bgfx.git
url = https://github.com/BabylonJS/bgfx.git
[submodule "bx"]
path = bx
url = https://github.com/bkaradzic/bx.git
Expand Down
Loading