Compare commits

...

22 Commits

Author SHA1 Message Date
loanselot
29888bfb88 Merge pull request #72 from bkaradzic/dependabot/submodules/bgfx-6573fc4
Bump bgfx from `ffeba57` to `6573fc4`
2021-10-23 07:15:25 +03:00
e-erdal
0133fc5cca Remove bounds 2021-10-23 06:39:13 +03:00
dependabot[bot]
3dc17e4d12 Bump bgfx from ffeba57 to 6573fc4
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `ffeba57` to `6573fc4`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](ffeba57b8a...6573fc44a8)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-21 14:19:10 +00:00
loanselot
83e5c829c1 Merge pull request #71 from bkaradzic/dependabot/submodules/bx-f324ffa
Bump bx from `ce8f0ec` to `f324ffa`
2021-10-21 17:18:30 +03:00
dependabot[bot]
b64b46c01b Bump bx from ce8f0ec to f324ffa
Bumps [bx](https://github.com/bkaradzic/bx) from `ce8f0ec` to `f324ffa`.
- [Release notes](https://github.com/bkaradzic/bx/releases)
- [Commits](ce8f0ec49b...f324ffad46)

---
updated-dependencies:
- dependency-name: bx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-18 16:16:08 +00:00
loanselot
b455d69ebc Merge pull request #69 from bkaradzic/dependabot/submodules/bgfx-ffeba57
Bump bgfx from `f99a6b4` to `ffeba57`
2021-10-18 10:27:03 +03:00
loanselot
4702973847 Merge pull request #70 from bkaradzic/dependabot/submodules/bx-ce8f0ec
Bump bx from `c7fc7b4` to `ce8f0ec`
2021-10-18 10:26:55 +03:00
e-erdal
7f96ef20a7 Add example "fsr" 2021-10-18 10:26:07 +03:00
dependabot[bot]
06ea813ee0 Bump bx from c7fc7b4 to ce8f0ec
Bumps [bx](https://github.com/bkaradzic/bx) from `c7fc7b4` to `ce8f0ec`.
- [Release notes](https://github.com/bkaradzic/bx/releases)
- [Commits](c7fc7b4ac6...ce8f0ec49b)

---
updated-dependencies:
- dependency-name: bx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-15 16:12:43 +00:00
dependabot[bot]
813fd9be03 Bump bgfx from f99a6b4 to ffeba57
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `f99a6b4` to `ffeba57`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](f99a6b4246...ffeba57b8a)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-15 16:12:40 +00:00
loanselot
417f8b82ef Merge pull request #59 from bkaradzic/dependabot/submodules/bgfx-f99a6b4
Bump bgfx from `73db386` to `f99a6b4`
2021-10-05 01:03:15 +03:00
dependabot[bot]
8ee2f954a2 Bump bgfx from 73db386 to f99a6b4
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `73db386` to `f99a6b4`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](73db386165...f99a6b4246)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-04 21:15:49 +00:00
loanselot
e3b3cb5909 Merge pull request #60 from bkaradzic/dependabot/submodules/bx-c7fc7b4
Bump bx from `9768d3a` to `c7fc7b4`
2021-10-05 00:15:03 +03:00
dependabot[bot]
6c16c52a4f Bump bx from 9768d3a to c7fc7b4
Bumps [bx](https://github.com/bkaradzic/bx) from `9768d3a` to `c7fc7b4`.
- [Release notes](https://github.com/bkaradzic/bx/releases)
- [Commits](9768d3a728...c7fc7b4ac6)

---
updated-dependencies:
- dependency-name: bx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-04 20:30:11 +00:00
loanselot
74592e610a Merge pull request #57 from bkaradzic/dependabot/submodules/bgfx-73db386
Bump bgfx from `89b6c25` to `73db386`
2021-10-01 23:08:16 +03:00
dependabot[bot]
b08be80829 Bump bgfx from 89b6c25 to 73db386
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `89b6c25` to `73db386`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](89b6c25c4a...73db386165)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-10-01 16:14:26 +00:00
loanselot
3095512f37 Merge pull request #56 from bkaradzic/dependabot/submodules/bgfx-89b6c25
Bump bgfx from `b8d2f01` to `89b6c25`
2021-09-30 15:56:39 +03:00
dependabot[bot]
d58b1d98c6 Bump bgfx from b8d2f01 to 89b6c25
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `b8d2f01` to `89b6c25`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](b8d2f01b98...89b6c25c4a)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-28 16:15:10 +00:00
loanselot
39387a2e04 Merge pull request #54 from bkaradzic/dependabot/submodules/bgfx-b8d2f01
Bump bgfx from `ad8e7eb` to `b8d2f01`
2021-09-27 22:48:59 +03:00
dependabot[bot]
20e0d21288 Bump bgfx from ad8e7eb to b8d2f01
Bumps [bgfx](https://github.com/bkaradzic/bgfx) from `ad8e7eb` to `b8d2f01`.
- [Release notes](https://github.com/bkaradzic/bgfx/releases)
- [Commits](ad8e7eb974...b8d2f01b98)

---
updated-dependencies:
- dependency-name: bgfx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 17:23:45 +00:00
loanselot
03435e280b Merge pull request #55 from bkaradzic/dependabot/submodules/bx-9768d3a
Bump bx from `e50536a` to `9768d3a`
2021-09-27 20:23:03 +03:00
dependabot[bot]
d0b1c186bd Bump bx from e50536a to 9768d3a
Bumps [bx](https://github.com/bkaradzic/bx) from `e50536a` to `9768d3a`.
- [Release notes](https://github.com/bkaradzic/bx/releases)
- [Commits](e50536ac03...9768d3a728)

---
updated-dependencies:
- dependency-name: bx
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
2021-09-27 16:14:03 +00:00
5 changed files with 4 additions and 10 deletions

2
bgfx

Submodule bgfx updated: ad8e7eb974...6573fc44a8

2
bx

Submodule bx updated: e50536ac03...f324ffad46

View File

@@ -274,6 +274,7 @@ if( BGFX_BUILD_EXAMPLES )
43-denoise
44-sss
45-bokeh
46-fsr
)
foreach( EXAMPLE ${BGFX_EXAMPLES} )

View File

@@ -21,13 +21,6 @@ configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/shader.cpp.in
target_sources( bgfx-shader INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/shader.cpp )
target_include_directories( bgfx-shader INTERFACE ${BGFX_DIR}/include )
add_library( bgfx-bounds INTERFACE )
configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/generated/bounds.cpp.in
${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp )
target_sources( bgfx-bounds INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/generated/bounds.cpp )
target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/include )
target_include_directories( bgfx-bounds INTERFACE ${BGFX_DIR}/examples/common )
# Frameworks required on OS X
if( ${CMAKE_SYSTEM_NAME} MATCHES Darwin )
find_library( COCOA_LIBRARY Cocoa )

View File

@@ -15,7 +15,7 @@ include( cmake/3rdparty/meshoptimizer.cmake )
add_executable( geometryc ${BGFX_DIR}/tools/geometryc/geometryc.cpp )
target_compile_definitions( geometryc PRIVATE "-D_CRT_SECURE_NO_WARNINGS" )
set_target_properties( geometryc PROPERTIES FOLDER "bgfx/tools" )
target_link_libraries( geometryc bx bgfx-bounds bgfx-vertexlayout meshoptimizer )
target_link_libraries( geometryc bx bgfx-vertexlayout meshoptimizer )
if( BGFX_CUSTOM_TARGETS )
add_dependencies( tools geometryc )
endif()