Compare commits

...

8 Commits

Author SHA1 Message Date
Matt Tytel
a952acef35 Make sure mm files aren't globbed on non-apple computers 2025-10-29 21:44:41 -04:00
Jason Millard
dddc79f2ee Add missing validate_graph.cpp to fix dependabot builds 2025-10-22 17:49:15 -04:00
dependabot[bot]
fbf0903e50 build(deps): bump the submodules group with 2 updates
Bumps the submodules group with 2 updates: [bgfx](https://github.com/bkaradzic/bgfx) and [bx](https://github.com/bkaradzic/bx).


Updates `bgfx` from `7a70927` to `b0e9cbd`
- [Commits](7a70927d2a...b0e9cbd110)

Updates `bx` from `eda3839` to `59d9249`
- [Commits](eda38395dd...59d9249854)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-version: b0e9cbd11041a602067ef00b22a281a922f8e1b2
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bx
  dependency-version: 59d9249854f1f588dc9e7a79549fe954bcd8a5e7
  dependency-type: direct:production
  dependency-group: submodules
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-10-22 17:49:15 -04:00
dependabot[bot]
5f3f4f2972 build(deps): bump the submodules group with 3 updates
Bumps the submodules group with 3 updates: [bgfx](https://github.com/bkaradzic/bgfx), [bx](https://github.com/bkaradzic/bx) and [bimg](https://github.com/bkaradzic/bimg).


Updates `bgfx` from `23baae9` to `7a70927`
- [Commits](23baae9e00...7a70927d2a)

Updates `bx` from `d858859` to `eda3839`
- [Commits](d858859d17...eda38395dd)

Updates `bimg` from `3af74f3` to `a1a2ae3`
- [Commits](3af74f3fe1...a1a2ae3c12)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-version: 7a70927d2af7ffcc5cef9c9e8f4c821e31fcb099
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bx
  dependency-version: eda38395ddfdeba08c46653b93b8d5bb21f2c863
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bimg
  dependency-version: a1a2ae3c129d8c33e765eecd91801bffd985c317
  dependency-type: direct:production
  dependency-group: submodules
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-09-10 14:45:34 -04:00
dependabot[bot]
bd755d6c91 build(deps): bump the submodules group with 2 updates
Bumps the submodules group with 2 updates: [bgfx](https://github.com/bkaradzic/bgfx) and [bimg](https://github.com/bkaradzic/bimg).


Updates `bgfx` from `14e0aa5` to `23baae9`
- [Commits](14e0aa5aff...23baae9e00)

Updates `bimg` from `446b9eb` to `3af74f3`
- [Commits](446b9eb111...3af74f3fe1)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-version: 23baae9e0010ee03edd8904fc7e176c76f4f8e2c
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bimg
  dependency-version: 3af74f3fe1a36c1ce17d2443c352eb8dbb3a5bd4
  dependency-type: direct:production
  dependency-group: submodules
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-08-03 19:21:05 -04:00
dependabot[bot]
e8a92ffbbe build(deps): bump the submodules group with 2 updates
Bumps the submodules group with 2 updates: [bgfx](https://github.com/bkaradzic/bgfx) and [bx](https://github.com/bkaradzic/bx).


Updates `bgfx` from `4109e14` to `14e0aa5`
- [Commits](4109e14b43...14e0aa5aff)

Updates `bx` from `5a20afe` to `d858859`
- [Commits](5a20afef84...d858859d17)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-version: 14e0aa5aff65a12df621fbc9466b42d41d01f013
  dependency-type: direct:production
  dependency-group: submodules
- dependency-name: bx
  dependency-version: d858859d1724fc037129318330f9c5ee5e008a08
  dependency-type: direct:production
  dependency-group: submodules
...

Signed-off-by: dependabot[bot] <support@github.com>
2025-07-03 07:10:16 -04:00
alemuntoni
657dd62551 bump submodules and add new sources to spirv-opt.cmake 2025-05-29 14:57:33 -04:00
Jason Millard
36a0d1d8d0 actions: bump actions. fixes upload-artifact@v3 failures 2025-02-27 17:03:45 -05:00
8 changed files with 41 additions and 34 deletions

View File

@@ -17,7 +17,7 @@ jobs:
env:
CMAKE_VERSION: 3.10.2
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Linux dependencies
@@ -57,7 +57,7 @@ jobs:
CC: ${{ matrix.cc }}
CXX: ${{ matrix.cxx }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Linux dependencies
@@ -94,7 +94,7 @@ jobs:
strategy:
fail-fast: false
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Linux dependencies

View File

@@ -12,7 +12,7 @@ jobs:
name: cmake-format
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -21,7 +21,7 @@ jobs:
if: startsWith(github.event_name, 'pull_request')
- name: Format CMake files
id: cmake-format
uses: PuneetMatharu/cmake-format-lint-action@main
uses: PuneetMatharu/cmake-format-lint-action@v1.0.6
with:
args: --config-files .cmake-format.py --check
# Run only if a PR and cmake-format has failed
@@ -31,7 +31,7 @@ jobs:
needs: cmake-format-check
if: always() && startsWith(github.event_name, 'pull_request') && needs.cmake-format-check.result == 'failure'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
ref: ${{ github.event.pull_request.head.ref }}
repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -40,7 +40,7 @@ jobs:
if: startsWith(github.event_name, 'pull_request')
- name: Format CMake files
id: cmake-format
uses: PuneetMatharu/cmake-format-lint-action@v1.0.0
uses: PuneetMatharu/cmake-format-lint-action@v1.0.6
with:
args: --config-files .cmake-format.py --in-place
- run: |

View File

@@ -18,7 +18,7 @@ jobs:
sha: ${{ steps.version.outputs.sha }}
tag: ${{ steps.version.outputs.tag }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
@@ -51,7 +51,7 @@ jobs:
CMAKE_INSTALL_DIR: ${{ github.workspace }}/install/
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
- name: Install Linux dependencies
@@ -80,7 +80,7 @@ jobs:
- name: Build
run: |
cmake --build "${{ env.CMAKE_BUILD_DIR }}" --target install --config Release
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ matrix.os }}
path: ${{ github.workspace }}/install/
@@ -93,7 +93,7 @@ jobs:
permissions:
contents: write
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
with:
submodules: recursive
fetch-depth: 0
@@ -102,69 +102,69 @@ jobs:
find src/bgfx.cmake -name ".git*" -exec rm -rf {} +
find src/bgfx.cmake -name ".editorconfig" -delete
rm src/bgfx.cmake/.cmake-format.py
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: windows-latest
path: ${{ github.workspace }}/install/windows/bgfx.cmake
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: ubuntu-latest
path: ${{ github.workspace }}/install/linux/bgfx.cmake
- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: macos-latest
path: ${{ github.workspace }}/install/macos/bgfx.cmake
- name: Create Source Zip
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'zip'
filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.zip'
directory: 'src'
path: 'bgfx.cmake'
- name: Create Source Tar
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'tar'
filename: 'bgfx.cmake.${{ needs.version.outputs.tag }}.tar.gz'
directory: 'src'
path: 'bgfx.cmake'
- name: Create Windows Zip
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'zip'
filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.zip'
directory: 'install/windows'
path: 'bgfx.cmake'
- name: Create Windows Tar
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'tar'
filename: 'bgfx.cmake.binary.windows.${{ needs.version.outputs.tag }}.tar.gz'
directory: 'install/windows'
path: 'bgfx.cmake'
- name: Create Linux Zip
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'zip'
filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.zip'
directory: 'install/linux'
path: 'bgfx.cmake'
- name: Create Linux Tar
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'tar'
filename: 'bgfx.cmake.binary.linux.${{ needs.version.outputs.tag }}.tar.gz'
directory: 'install/linux'
path: 'bgfx.cmake'
- name: Create MacOS Zip
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'zip'
filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.zip'
directory: 'install/macos'
path: 'bgfx.cmake'
- name: Create MacOS Tar
uses: thedoctor0/zip-release@0.7.1
uses: thedoctor0/zip-release@0.7.6
with:
type: 'tar'
filename: 'bgfx.cmake.binary.macos.${{ needs.version.outputs.tag }}.tar.gz'

2
bgfx

Submodule bgfx updated: de56398919...b0e9cbd110

2
bimg

Submodule bimg updated: c5c7b6e187...a1a2ae3c12

2
bx

Submodule bx updated: 01c99ddd09...59d9249854

View File

@@ -70,6 +70,8 @@ file(
${SPIRV_TOOLS}/source/spirv_validator_options.h
${SPIRV_TOOLS}/source/table.cpp
${SPIRV_TOOLS}/source/table.h
${SPIRV_TOOLS}/source/table2.cpp
${SPIRV_TOOLS}/source/table2.h
${SPIRV_TOOLS}/source/text.cpp
${SPIRV_TOOLS}/source/text.h
${SPIRV_TOOLS}/source/text_handler.cpp
@@ -110,10 +112,12 @@ file(
${SPIRV_TOOLS}/source/val/validate_execution_limitations.cpp
${SPIRV_TOOLS}/source/val/validate_extensions.cpp
${SPIRV_TOOLS}/source/val/validate_function.cpp
${SPIRV_TOOLS}/source/val/validate_graph.cpp
${SPIRV_TOOLS}/source/val/validate_id.cpp
${SPIRV_TOOLS}/source/val/validate_image.cpp
${SPIRV_TOOLS}/source/val/validate_instruction.cpp
${SPIRV_TOOLS}/source/val/validate_interfaces.cpp
${SPIRV_TOOLS}/source/val/validate_invalid_type.cpp
${SPIRV_TOOLS}/source/val/validate_layout.cpp
${SPIRV_TOOLS}/source/val/validate_literals.cpp
${SPIRV_TOOLS}/source/val/validate_logicals.cpp
@@ -129,6 +133,7 @@ file(
${SPIRV_TOOLS}/source/val/validate_ray_tracing_reorder.cpp
${SPIRV_TOOLS}/source/val/validate_scopes.cpp
${SPIRV_TOOLS}/source/val/validate_small_type_uses.cpp
${SPIRV_TOOLS}/source/val/validate_tensor.cpp
${SPIRV_TOOLS}/source/val/validate_tensor_layout.cpp
${SPIRV_TOOLS}/source/val/validate_type.cpp
${SPIRV_TOOLS}/source/val/validation_state.cpp

View File

@@ -19,22 +19,25 @@ if(NOT IS_DIRECTORY ${BGFX_DIR})
return()
endif()
if(NOT APPLE)
set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
else()
set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm)
endif()
# Grab the bgfx source files
file(
GLOB
BGFX_SOURCES
${BGFX_DIR}/src/*.cpp
${BGFX_DIR}/src/*.mm
${BGFX_DIR}/src/*.h
${BGFX_DIR}/include/bgfx/*.h
${BGFX_DIR}/include/bgfx/c99/*.h
)
if(APPLE)
file(GLOB BGFX_OBJC_SOURCES ${BGFX_DIR}/src/*.mm)
list(APPEND BGFX_SOURCES ${BGFX_OBJC_SOURCES})
list(REMOVE_ITEM BGFX_SOURCES ${BGFX_DIR}/src/amalgamated.cpp)
set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.mm)
else()
set(BGFX_AMALGAMATED_SOURCE ${BGFX_DIR}/src/amalgamated.cpp)
endif()
if(BGFX_AMALGAMATED)
set(BGFX_NOBUILD ${BGFX_SOURCES})
list(REMOVE_ITEM BGFX_NOBUILD ${BGFX_AMALGAMATED_SOURCE})
@@ -43,8 +46,7 @@ if(BGFX_AMALGAMATED)
endforeach()
else()
# Do not build using amalgamated sources
set_source_files_properties(${BGFX_DIR}/src/amalgamated.cpp PROPERTIES HEADER_FILE_ONLY ON)
set_source_files_properties(${BGFX_DIR}/src/amalgamated.mm PROPERTIES HEADER_FILE_ONLY ON)
set_source_files_properties(${BGFX_AMALGAMATED_SOURCE} PROPERTIES HEADER_FILE_ONLY ON)
endif()
# Create the bgfx target