Compare commits
241
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
22ba8875c5 | ||
|
|
843e1a43c4 | ||
|
|
98eea205f3 | ||
|
|
1c22b48893 | ||
|
|
249dd9752d | ||
|
|
bb4cd43835 | ||
|
|
954d1021c7 | ||
|
|
bf598071a3 | ||
|
|
5cbc2321c7 | ||
|
|
6bee5fb56f | ||
|
|
eb0fcc065b | ||
|
|
117535364b | ||
|
|
b15ae15f39 | ||
|
|
74445904f2 | ||
|
|
678ad4ff98 | ||
|
|
b6d7ed2b35 | ||
|
|
725e33763a | ||
|
|
f24146c169 | ||
|
|
67288d483f | ||
|
|
c80c504a2a | ||
|
|
1f8cacdd70 | ||
|
|
a3ae9431f1 | ||
|
|
3d0653604f | ||
|
|
42a0a41be0 | ||
|
|
468d9cccb7 | ||
|
|
6cfd058e3d | ||
|
|
8234549cb9 | ||
|
|
c84d04254e | ||
|
|
573a51c430 | ||
|
|
b4d26bd32b | ||
|
|
5227ea36ce | ||
|
|
6f29ff988c | ||
|
|
3424222d6e | ||
|
|
a9ab9b6cd4 | ||
|
|
5d11dd653a | ||
|
|
7d1cb3ee85 | ||
|
|
8304cd9c32 | ||
|
|
6d1c337363 | ||
|
|
e59036c731 | ||
|
|
dd7d78b2a6 | ||
|
|
f096c4d8de | ||
|
|
da5ea821a8 | ||
|
|
1b944a6582 | ||
|
|
318a9002e7 | ||
|
|
eb5d9ac15d | ||
|
|
5cae0ee082 | ||
|
|
75d641ae8a | ||
|
|
c2c744b06d | ||
|
|
1e246d1332 | ||
|
|
7d242341f2 | ||
|
|
e625c7024c | ||
|
|
192a61a06b | ||
|
|
6a93e3a765 | ||
|
|
e1fb1391f9 | ||
|
|
a3922ac3a9 | ||
|
|
5f1112d85e | ||
|
|
09545690bf | ||
|
|
3ce752c47b | ||
|
|
1f9f3ddb91 | ||
|
|
8e94688fbf | ||
|
|
438ee40f40 | ||
|
|
7f22d733d7 | ||
|
|
77d77f0a5c | ||
|
|
0aabd3dd6a | ||
|
|
72a54b30f9 | ||
|
|
00b2ab7ac4 | ||
|
|
39e15d67fc | ||
|
|
921dbddad9 | ||
|
|
6406d4602c | ||
|
|
880cd66166 | ||
|
|
f27ff203cf | ||
|
|
3ea8e529cc | ||
|
|
572dd233d7 | ||
|
|
c19070e477 | ||
|
|
64328b7388 | ||
|
|
1414fdcd38 | ||
|
|
e607a035ae | ||
|
|
0496e089c1 | ||
|
|
b310e3d24a | ||
|
|
b359d77669 | ||
|
|
e57a4061cc | ||
|
|
53f82e6b71 | ||
|
|
e88bba5940 | ||
|
|
0b83454d08 | ||
|
|
1ef0d36f79 | ||
|
|
e350737d1e | ||
|
|
cb203b13de | ||
|
|
92a0d7bfc3 | ||
|
|
c1a7ed2799 | ||
|
|
692301bdf1 | ||
|
|
05b87b3c42 | ||
|
|
9825297e70 | ||
|
|
6a59c887de | ||
|
|
33b4b46220 | ||
|
|
06170a25f7 | ||
|
|
418dad883d | ||
|
|
447661efed | ||
|
|
bd61ab691c | ||
|
|
2a04cee97f | ||
|
|
5ae7760752 | ||
|
|
56b8bf5b4b | ||
|
|
6af38fa47f | ||
|
|
0c01799c50 | ||
|
|
e2519e0eed | ||
|
|
6178ae0459 | ||
|
|
8a1a0b0fd2 | ||
|
|
a7c3cf4173 | ||
|
|
57b68eeba3 | ||
|
|
ad8c9ce4e0 | ||
|
|
7dc0f2cc86 | ||
|
|
37110799ef | ||
|
|
88a06ec8e7 | ||
|
|
38705d6226 | ||
|
|
d325bb43cf | ||
|
|
0c52d3c9bf | ||
|
|
770176a1e3 | ||
|
|
672603f9b4 | ||
|
|
0ecf6c46e2 | ||
|
|
8b87a54c1a | ||
|
|
cd1d3e8749 | ||
|
|
e88072cec0 | ||
|
|
1d2e165d99 | ||
|
|
cfc4ac5511 | ||
|
|
73a03d7af0 | ||
|
|
56dc348cc8 | ||
|
|
1b46ddd8b6 | ||
|
|
a68aaa114e | ||
|
|
3da7dabb2a | ||
|
|
1e2311da3d | ||
|
|
a38c55c82d | ||
|
|
cd22478e4f | ||
|
|
60036c75fe | ||
|
|
044f2aeb7c | ||
|
|
c73d11858e | ||
|
|
23b67be41a | ||
|
|
7d53baad5c | ||
|
|
1ae33a23fe | ||
|
|
351d9287af | ||
|
|
e7e5004946 | ||
|
|
b9be9b4f2d | ||
|
|
ce88a56579 | ||
|
|
689e769f9a | ||
|
|
2f0a8b19b5 | ||
|
|
1bed68afb7 | ||
|
|
130e02da5c | ||
|
|
8e06a68446 | ||
|
|
656b50b304 | ||
|
|
880db4ec43 | ||
|
|
2ce294720d | ||
|
|
eb07decb4b | ||
|
|
47930edf70 | ||
|
|
05b89905d8 | ||
|
|
3e0df36c1c | ||
|
|
c9ce384f14 | ||
|
|
6a6bdd5be7 | ||
|
|
d56ade924e | ||
|
|
fe561e3e27 | ||
|
|
1d98e350e4 | ||
|
|
d34e018acb | ||
|
|
169c8d57ff | ||
|
|
a1e0cfa33c | ||
|
|
6d44db3ca0 | ||
|
|
a261429d06 | ||
|
|
69d0de3c6d | ||
|
|
1305303f2e | ||
|
|
8532511107 | ||
|
|
b762ccb78c | ||
|
|
3296eb153c | ||
|
|
ae6d1028f7 | ||
|
|
92579b6307 | ||
|
|
315b53c339 | ||
|
|
c55d459986 | ||
|
|
7876695545 | ||
|
|
e1a1464c5d | ||
|
|
67ed5141bf | ||
|
|
b9d7a25b91 | ||
|
|
ba63ac63a0 | ||
|
|
1e77947758 | ||
|
|
53df4012fe | ||
|
|
d880fab93f | ||
|
|
fb8030b80a | ||
|
|
e2d009ff2a | ||
|
|
0a67ef4d80 | ||
|
|
79d6f46f1a | ||
|
|
6481fa2acf | ||
|
|
7638b3ddd9 | ||
|
|
fe474a9d7e | ||
|
|
81008abe06 | ||
|
|
ef1d079c53 | ||
|
|
5286dec70b | ||
|
|
d748dc590e | ||
|
|
93a0aec246 | ||
|
|
f3fa734793 | ||
|
|
33d3c3a897 | ||
|
|
bbabf3480b | ||
|
|
e7a8f471a1 | ||
|
|
d45a5cc926 | ||
|
|
361ba2afea | ||
|
|
78419cd992 | ||
|
|
cc7361dba5 | ||
|
|
5c0841ff56 | ||
|
|
10af183756 | ||
|
|
56e0e9a424 | ||
|
|
86a500c846 | ||
|
|
5b3f13fc1d | ||
|
|
1b1dfaa57c | ||
|
|
bf8c84bbe5 | ||
|
|
fb179cabbc | ||
|
|
a80ea743e8 | ||
|
|
97f8106909 | ||
|
|
d455899b93 | ||
|
|
63fe439a5e | ||
|
|
7847220aba | ||
|
|
d76ae4395b | ||
|
|
f994cb58ce | ||
|
|
52eb682498 | ||
|
|
5a5168a191 | ||
|
|
e85dfe75c8 | ||
|
|
6beb40b0a1 | ||
|
|
5cb96e5732 | ||
|
|
927aa57a4e | ||
|
|
36e775902d | ||
|
|
53e28f3b33 | ||
|
|
7ccbdb4633 | ||
|
|
f10d226565 | ||
|
|
28ecf5c35d | ||
|
|
9683eb649c | ||
|
|
3d10ae3ee3 | ||
|
|
44a75dd44b | ||
|
|
de7bcd2df7 | ||
|
|
6adf140fb4 | ||
|
|
b94c802076 | ||
|
|
b231de0b5b | ||
|
|
fca200d549 | ||
|
|
ba1d3f6c76 | ||
|
|
7734fd4ad9 | ||
|
|
7e6839f535 | ||
|
|
3d78322058 | ||
|
|
3e1ea7cdfd | ||
|
|
6d413a4faf | ||
|
|
af09c517b6 |
+1
-1
@@ -57,7 +57,7 @@ SpaceBeforeInheritanceColon: true
|
|||||||
SpaceBeforeParens: ControlStatements
|
SpaceBeforeParens: ControlStatements
|
||||||
SpaceBeforeRangeBasedForLoopColon: false
|
SpaceBeforeRangeBasedForLoopColon: false
|
||||||
SpaceInEmptyParentheses: false
|
SpaceInEmptyParentheses: false
|
||||||
SpacesBeforeTrailingComments: 0
|
SpacesBeforeTrailingComments: 1
|
||||||
SpacesInAngles: false
|
SpacesInAngles: false
|
||||||
SpacesInCStyleCastParentheses: false
|
SpacesInCStyleCastParentheses: false
|
||||||
SpacesInContainerLiterals: false
|
SpacesInContainerLiterals: false
|
||||||
|
|||||||
@@ -3,5 +3,5 @@ runs:
|
|||||||
using: "composite"
|
using: "composite"
|
||||||
steps:
|
steps:
|
||||||
- name: Set up dependency versions
|
- name: Set up dependency versions
|
||||||
shell: bash
|
shell: bash
|
||||||
run: cat ./build/common/versions >> $GITHUB_ENV
|
run: cat ./build/common/versions >> $GITHUB_ENV
|
||||||
|
|||||||
@@ -0,0 +1,45 @@
|
|||||||
|
name: 'Get commit message'
|
||||||
|
outputs:
|
||||||
|
msg:
|
||||||
|
value: ${{ steps.action_output.outputs.msg }}
|
||||||
|
runs:
|
||||||
|
using: "composite"
|
||||||
|
steps:
|
||||||
|
- name: Find commit message (on push)
|
||||||
|
if: github.event_name == 'push'
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
AUTHOR_NAME="${{ github.event.head_commit.author.name }}"
|
||||||
|
AUTHOR_EMAIL="${{ github.event.head_commit.author.email }}"
|
||||||
|
TSTAMP="${{ github.event.head_commit.timestamp }}"
|
||||||
|
echo "commit ${{ github.event.head_commit.id }}" >> /tmp/commit_msg.txt
|
||||||
|
echo "Author: ${AUTHOR_NAME}<${AUTHOR_EMAIL}>" >> /tmp/commit_msg.txt
|
||||||
|
echo "Date: ${TSTAMP}" >> /tmp/commit_msg.txt
|
||||||
|
echo "" >> /tmp/commit_msg.txt
|
||||||
|
echo "${{ github.event.head_commit.message }}" >> /tmp/commit_msg.txt
|
||||||
|
- name: Find commit message (PR)
|
||||||
|
shell: bash
|
||||||
|
id: checkout_code
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
run: |
|
||||||
|
echo "+++++ head commit message +++++"
|
||||||
|
echo "$(git log -1 --no-merges)"
|
||||||
|
echo "+++++++++++++++++++++++++++++++"
|
||||||
|
echo "hash=$(git rev-parse HEAD)" >> "$GITHUB_OUTPUT"
|
||||||
|
git checkout ${{ github.event.pull_request.head.sha }}
|
||||||
|
echo "$(git log -1 --no-merges)" >> /tmp/commit_msg.txt
|
||||||
|
- shell: bash
|
||||||
|
id: action_output
|
||||||
|
run: |
|
||||||
|
DELIMITER="EOF_FILE_CONTENT_$(date +%s)" # Using timestamp to make it more unique
|
||||||
|
echo "msg<<$DELIMITER" >> "$GITHUB_OUTPUT"
|
||||||
|
cat /tmp/commit_msg.txt >> "$GITHUB_OUTPUT"
|
||||||
|
echo "$DELIMITER" >> "$GITHUB_OUTPUT"
|
||||||
|
echo "----- got commit message ---"
|
||||||
|
cat /tmp/commit_msg.txt
|
||||||
|
echo "----------------------------"
|
||||||
|
- name: Cleanup Find commit message (PR)
|
||||||
|
shell: bash
|
||||||
|
if: github.event_name == 'pull_request'
|
||||||
|
run: |
|
||||||
|
git checkout ${{ steps.checkout_code.outputs.hash }}
|
||||||
@@ -0,0 +1,16 @@
|
|||||||
|
name: 'Web Preqrequisites'
|
||||||
|
runs:
|
||||||
|
using: "composite"
|
||||||
|
steps:
|
||||||
|
- uses: ./.github/actions/dep-versions
|
||||||
|
- name: Cache EMSDK
|
||||||
|
id: emsdk-cache
|
||||||
|
uses: actions/cache@v4 # Use a specific version
|
||||||
|
with:
|
||||||
|
path: emsdk
|
||||||
|
key: ${{ runner.os }}-emsdk-${{ env.GITHUB_EMSDK_VERSION }}
|
||||||
|
- name: Install Web Prerequisites
|
||||||
|
shell: bash
|
||||||
|
run: |
|
||||||
|
bash ./build/common/get-emscripten.sh
|
||||||
|
echo "EMSDK=$PWD/emsdk" >> $GITHUB_ENV
|
||||||
@@ -26,4 +26,4 @@ jobs:
|
|||||||
path: out/filament-release-darwin.tgz
|
path: out/filament-release-darwin.tgz
|
||||||
- name: Check public headers
|
- name: Check public headers
|
||||||
run: |
|
run: |
|
||||||
build/common/check-headers.sh out/release/filament/include
|
test/check-headers/test.sh out/release/filament/include
|
||||||
|
|||||||
@@ -0,0 +1,35 @@
|
|||||||
|
name: 'Post-submit tasks'
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
branches:
|
||||||
|
- main
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
update-renderdiff-goldens:
|
||||||
|
name: update-renderdiff-goldens
|
||||||
|
runs-on: 'ubuntu-24.04-4core'
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v4.1.6
|
||||||
|
with:
|
||||||
|
fetch-depth: 0
|
||||||
|
- uses: ./.github/actions/linux-prereq
|
||||||
|
- id: get_commit_msg
|
||||||
|
uses: ./.github/actions/get-commit-msg
|
||||||
|
- name: Prerequisites
|
||||||
|
run: pip install tifffile numpy
|
||||||
|
- name: Run update script
|
||||||
|
env:
|
||||||
|
GH_TOKEN: ${{ secrets.FILAMENTBOT_TOKEN }}
|
||||||
|
run: |
|
||||||
|
GOLDEN_BRANCH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | python3 test/renderdiff/src/commit_msg.py)
|
||||||
|
COMMIT_HASH=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | head -n 1 | tr -d 'commit ')
|
||||||
|
if [[ "${GOLDEN_BRANCH}" != "main" ]]; then
|
||||||
|
git config --global user.email "filament.bot@gmail.com"
|
||||||
|
git config --global user.name "Filament Bot"
|
||||||
|
git config --global credential.helper cache
|
||||||
|
echo "branch==${GOLDEN_BRANCH}"
|
||||||
|
echo "hash==${COMMIT_HASH}"
|
||||||
|
python3 test/renderdiff/src/update_golden.py --branch=${GOLDEN_BRANCH} \
|
||||||
|
--merge-to-main --filament-tag=${COMMIT_HASH} --golden-repo-token=${GH_TOKEN}
|
||||||
|
fi
|
||||||
@@ -3,10 +3,10 @@ name: Presubmit
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
pull_request:
|
pull_request:
|
||||||
branches:
|
branches:
|
||||||
- main
|
- main
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-desktop-mac:
|
build-desktop-mac:
|
||||||
@@ -41,8 +41,7 @@ jobs:
|
|||||||
|
|
||||||
build-windows:
|
build-windows:
|
||||||
name: build-windows
|
name: build-windows
|
||||||
runs-on: win-2019-16core
|
runs-on: windows-2022-32core
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
@@ -55,7 +54,6 @@ jobs:
|
|||||||
build-android:
|
build-android:
|
||||||
name: build-android
|
name: build-android
|
||||||
runs-on: 'ubuntu-24.04-16core'
|
runs-on: 'ubuntu-24.04-16core'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
@@ -74,7 +72,6 @@ jobs:
|
|||||||
build-ios:
|
build-ios:
|
||||||
name: build-iOS
|
name: build-iOS
|
||||||
runs-on: macos-14-xlarge
|
runs-on: macos-14-xlarge
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
@@ -90,12 +87,12 @@ jobs:
|
|||||||
build-web:
|
build-web:
|
||||||
name: build-web
|
name: build-web
|
||||||
runs-on: 'ubuntu-24.04-16core'
|
runs-on: 'ubuntu-24.04-16core'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: ./.github/actions/linux-prereq
|
- uses: ./.github/actions/linux-prereq
|
||||||
|
- uses: ./.github/actions/web-prereq
|
||||||
- name: Run build script
|
- name: Run build script
|
||||||
run: |
|
run: |
|
||||||
cd build/web && printf "y" | ./build.sh presubmit
|
cd build/web && printf "y" | ./build.sh presubmit
|
||||||
@@ -107,11 +104,12 @@ jobs:
|
|||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
- id: get_commit_msg
|
||||||
|
uses: ./.github/actions/get-commit-msg
|
||||||
- name: Check for manual edits to /docs
|
- name: Check for manual edits to /docs
|
||||||
run: |
|
run: |
|
||||||
echo "${{ github.event.pull_request.head.sha }} -- ${{ github.event.pull_request.head.sha }}"
|
COMMIT_ID=$(echo "${{ steps.get_commit_msg.outputs.msg }}" | head -n 1 | sed "s/commit //g")
|
||||||
# disable for now
|
bash docs_src/build/presubmit_check.sh ${COMMIT_ID}
|
||||||
# bash docs_src/build/presubmit_check.sh ${{ github.event.pull_request.head.sha }}
|
|
||||||
|
|
||||||
test-renderdiff:
|
test-renderdiff:
|
||||||
name: test-renderdiff
|
name: test-renderdiff
|
||||||
@@ -120,22 +118,25 @@ jobs:
|
|||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
|
- id: get_commit_msg
|
||||||
|
uses: ./.github/actions/get-commit-msg
|
||||||
- uses: ./.github/actions/mac-prereq
|
- uses: ./.github/actions/mac-prereq
|
||||||
- name: Cache Mesa and deps
|
- name: Cache Mesa and deps
|
||||||
id: mesa-cache
|
uses: actions/cache@v4
|
||||||
uses: actions/cache@v4 # Use a specific version
|
|
||||||
with:
|
with:
|
||||||
path: mesa
|
path: mesa
|
||||||
key: ${{ runner.os }}-mesa-deps-2-${{ vars.MESA_VERSION }}
|
key: ${{ runner.os }}-mesa-deps-2-${{ vars.MESA_VERSION }}
|
||||||
- name: Get Mesa
|
- name: Prerequisites
|
||||||
id: mesa-prereq
|
run: |
|
||||||
run: bash test/utils/get_mesa.sh
|
bash build/common/get-mesa.sh
|
||||||
|
pip install tifffile numpy
|
||||||
- name: Run Test
|
- name: Run Test
|
||||||
run: bash test/renderdiff/test.sh
|
run: |
|
||||||
|
echo "${{ steps.get_commit_msg.outputs.msg }}" | bash test/renderdiff/test.sh
|
||||||
- uses: actions/upload-artifact@v4
|
- uses: actions/upload-artifact@v4
|
||||||
with:
|
with:
|
||||||
name: presubmit-renderdiff-result
|
name: presubmit-renderdiff-result
|
||||||
path: ./out/renderdiff_tests
|
path: ./out/renderdiff
|
||||||
|
|
||||||
validate-wgsl-webgpu:
|
validate-wgsl-webgpu:
|
||||||
name: validate-wgsl-webgpu
|
name: validate-wgsl-webgpu
|
||||||
@@ -150,8 +151,8 @@ jobs:
|
|||||||
- name: Run test
|
- name: Run test
|
||||||
run: ./out/cmake-debug/libs/filamat/test_filamat --gtest_filter=MaterialCompiler.Wgsl*
|
run: ./out/cmake-debug/libs/filamat/test_filamat --gtest_filter=MaterialCompiler.Wgsl*
|
||||||
|
|
||||||
code-correcteness:
|
test-code-correctness:
|
||||||
name: code-correctness
|
name: test-code-correctness
|
||||||
runs-on: 'macos-14-xlarge'
|
runs-on: 'macos-14-xlarge'
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
|
|||||||
@@ -65,13 +65,9 @@ jobs:
|
|||||||
|
|
||||||
build-mac:
|
build-mac:
|
||||||
name: build-mac
|
name: build-mac
|
||||||
runs-on: ${{ matrix.os }}
|
runs-on: macos-14-xlarge
|
||||||
if: github.event_name == 'release' || github.event.inputs.platform == 'desktop'
|
if: github.event_name == 'release' || github.event.inputs.platform == 'desktop'
|
||||||
|
|
||||||
strategy:
|
|
||||||
matrix:
|
|
||||||
os: [macos-14-xlarge, ubuntu-22.04-32core]
|
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- name: Decide Git ref
|
- name: Decide Git ref
|
||||||
id: git_ref
|
id: git_ref
|
||||||
@@ -118,6 +114,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
ref: ${{ steps.git_ref.outputs.ref }}
|
ref: ${{ steps.git_ref.outputs.ref }}
|
||||||
- uses: ./.github/actions/linux-prereq
|
- uses: ./.github/actions/linux-prereq
|
||||||
|
- uses: ./.github/actions/web-prereq
|
||||||
- name: Run build script
|
- name: Run build script
|
||||||
env:
|
env:
|
||||||
TAG: ${{ steps.git_ref.outputs.tag }}
|
TAG: ${{ steps.git_ref.outputs.tag }}
|
||||||
@@ -166,6 +163,9 @@ jobs:
|
|||||||
mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
|
mv out/filamat-android-release.aar out/filamat-${TAG}-android.aar
|
||||||
mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
|
mv out/gltfio-android-release.aar out/gltfio-${TAG}-android.aar
|
||||||
mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
|
mv out/filament-utils-android-release.aar out/filament-utils-${TAG}-android.aar
|
||||||
|
cd out/android-release/filament
|
||||||
|
tar -czf ../../filament-${TAG}-android-native.tgz .
|
||||||
|
cd ../../..
|
||||||
- name: Sign sample-gltf-viewer
|
- name: Sign sample-gltf-viewer
|
||||||
run: |
|
run: |
|
||||||
echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
|
echo "${APK_KEYSTORE_BASE64}" > filament.jks.base64
|
||||||
@@ -187,7 +187,7 @@ jobs:
|
|||||||
script: |
|
script: |
|
||||||
const upload = require('./build/common/upload-release-assets');
|
const upload = require('./build/common/upload-release-assets');
|
||||||
const { TAG } = process.env;
|
const { TAG } = process.env;
|
||||||
const globber = await glob.create(['out/*.aar', 'out/*.apk'].join('\n'));
|
const globber = await glob.create(['out/*.aar', 'out/*.apk', 'out/*.tgz'].join('\n'));
|
||||||
await upload({ github, context }, await globber.glob(), TAG);
|
await upload({ github, context }, await globber.glob(), TAG);
|
||||||
|
|
||||||
build-ios:
|
build-ios:
|
||||||
@@ -226,7 +226,7 @@ jobs:
|
|||||||
|
|
||||||
build-windows:
|
build-windows:
|
||||||
name: build-windows
|
name: build-windows
|
||||||
runs-on: windows-2019-32core
|
runs-on: windows-2022-32core
|
||||||
if: github.event_name == 'release' || github.event.inputs.platform == 'windows'
|
if: github.event_name == 'release' || github.event.inputs.platform == 'windows'
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
|
|||||||
@@ -17,6 +17,7 @@ jobs:
|
|||||||
with:
|
with:
|
||||||
fetch-depth: 0
|
fetch-depth: 0
|
||||||
- uses: ./.github/actions/linux-prereq
|
- uses: ./.github/actions/linux-prereq
|
||||||
|
- uses: ./.github/actions/web-prereq
|
||||||
- name: Run build script
|
- name: Run build script
|
||||||
run: |
|
run: |
|
||||||
cd build/web && printf "y" | ./build.sh continuous
|
cd build/web && printf "y" | ./build.sh continuous
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ on:
|
|||||||
jobs:
|
jobs:
|
||||||
build-windows:
|
build-windows:
|
||||||
name: build-windows
|
name: build-windows
|
||||||
runs-on: windows-2019-32core
|
runs-on: windows-2022-32core
|
||||||
|
|
||||||
steps:
|
steps:
|
||||||
- uses: actions/checkout@v4.1.6
|
- uses: actions/checkout@v4.1.6
|
||||||
|
|||||||
@@ -97,6 +97,10 @@ Make sure you've installed the following dependencies:
|
|||||||
- `libxcomposite-dev` (`libXcomposite-devel` on Fedora)
|
- `libxcomposite-dev` (`libXcomposite-devel` on Fedora)
|
||||||
- `libxxf86vm-dev` (`libXxf86vm-devel` on Fedora)
|
- `libxxf86vm-dev` (`libXxf86vm-devel` on Fedora)
|
||||||
|
|
||||||
|
```shell
|
||||||
|
sudo apt install clang-14 libglu1-mesa-dev libc++-14-dev libc++abi-14-dev ninja-build libxi-dev libxcomposite-dev libxxf86vm-dev -y
|
||||||
|
```
|
||||||
|
|
||||||
After dependencies have been installed, we highly recommend using the [easy build](#easy-build)
|
After dependencies have been installed, we highly recommend using the [easy build](#easy-build)
|
||||||
script.
|
script.
|
||||||
|
|
||||||
@@ -363,6 +367,8 @@ python ./emsdk.py activate latest
|
|||||||
source ./emsdk_env.sh
|
source ./emsdk_env.sh
|
||||||
```
|
```
|
||||||
|
|
||||||
|
Alternatively, you can try running the script `build/common/get-emscripten.sh`.
|
||||||
|
|
||||||
After this you can invoke the [easy build](#easy-build) script as follows:
|
After this you can invoke the [easy build](#easy-build) script as follows:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
|
|||||||
@@ -49,6 +49,12 @@ option(FILAMENT_SUPPORTS_OSMESA "Enable OSMesa (headless GL context) for Filamen
|
|||||||
|
|
||||||
option(FILAMENT_ENABLE_FGVIEWER "Enable the frame graph viewer" OFF)
|
option(FILAMENT_ENABLE_FGVIEWER "Enable the frame graph viewer" OFF)
|
||||||
|
|
||||||
|
option(FILAMENT_USE_ABSEIL_LOGGING "Use Abseil to log, may increase binary size" OFF)
|
||||||
|
|
||||||
|
# This is to disable GTAO for the short-term while we investigate a way to better manage size increases.
|
||||||
|
# On the regular filament build (where size is of less concern), we enable GTAO by default.
|
||||||
|
option(FILAMENT_DISABLE_GTAO "Disable GTAO" OFF)
|
||||||
|
|
||||||
set(FILAMENT_NDK_VERSION "" CACHE STRING
|
set(FILAMENT_NDK_VERSION "" CACHE STRING
|
||||||
"Android NDK version or version prefix to be used when building for Android."
|
"Android NDK version or version prefix to be used when building for Android."
|
||||||
)
|
)
|
||||||
@@ -587,6 +593,10 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug" AND NOT FILAMENT_BACKEND_DEBUG_FLAG STREQU
|
|||||||
unset(FILAMENT_BACKEND_DEBUG_FLAG)
|
unset(FILAMENT_BACKEND_DEBUG_FLAG)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (FILAMENT_USE_ABSEIL_LOGGING)
|
||||||
|
add_definitions(-DFILAMENT_USE_ABSEIL_LOGGING)
|
||||||
|
endif()
|
||||||
|
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
# Material compilation flags
|
# Material compilation flags
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Filament Release Notes log
|
# Filament Release Notes log
|
||||||
|
|
||||||
**If you are merging a PR into main**: please add the release note below, under the *Release notes
|
**If you are merging a PR into main**: please add the release note below, under the *Release notes
|
||||||
for next branch cut* header.
|
We are chaning the way Vulkan buffers are handled. We need to switch over to a managed (or view-based) model where the data stored inside the object is a proxy to a Vulkan object that can dynamically be swapped around.
|
||||||
|
|
||||||
**If you are cherry-picking a commit into an rc/ branch**: add the release note under the
|
**If you are cherry-picking a commit into an rc/ branch**: add the release note under the
|
||||||
appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
|
appropriate header in [RELEASE_NOTES.md](./RELEASE_NOTES.md).
|
||||||
|
|||||||
@@ -31,7 +31,7 @@ repositories {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.google.android.filament:filament-android:1.59.4'
|
implementation 'com.google.android.filament:filament-android:1.62.0'
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
@@ -51,7 +51,7 @@ Here are all the libraries available in the group `com.google.android.filament`:
|
|||||||
iOS projects can use CocoaPods to install the latest release:
|
iOS projects can use CocoaPods to install the latest release:
|
||||||
|
|
||||||
```shell
|
```shell
|
||||||
pod 'Filament', '~> 1.59.4'
|
pod 'Filament', '~> 1.62.0'
|
||||||
```
|
```
|
||||||
|
|
||||||
## Documentation
|
## Documentation
|
||||||
|
|||||||
@@ -7,6 +7,38 @@ A new header is inserted each time a *tag* is created.
|
|||||||
Instead, if you are authoring a PR for the main branch, add your release note to
|
Instead, if you are authoring a PR for the main branch, add your release note to
|
||||||
[NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md).
|
[NEW_RELEASE_NOTES.md](./NEW_RELEASE_NOTES.md).
|
||||||
|
|
||||||
|
## v1.62.1
|
||||||
|
|
||||||
|
- Add new shader define `VARIANT_DEPTH`, defined when a material is compiled for depth variants
|
||||||
|
(e.g., shadows) [**Requires recompiling materials**]
|
||||||
|
|
||||||
|
## v1.62.0
|
||||||
|
|
||||||
|
- Add new `unfilterable` field to Filament Material's `sampler` [⚠️ **New Material Version**]
|
||||||
|
|
||||||
|
## v1.61.2
|
||||||
|
|
||||||
|
- samples: samples now have a CLI to select backend api
|
||||||
|
|
||||||
|
## v1.61.1
|
||||||
|
|
||||||
|
|
||||||
|
## v1.61.0
|
||||||
|
|
||||||
|
- materials: sampler now export their type in the material binary [⚠️ **New Material Version**]
|
||||||
|
- samples/texturedquad.cpp now has CLI to select backend api
|
||||||
|
- samples/hellopbr.cpp CLI now allows for selecting webgpu
|
||||||
|
|
||||||
|
## v1.60.1
|
||||||
|
|
||||||
|
|
||||||
|
## v1.60.0
|
||||||
|
|
||||||
|
- materials: remove dependence on per-view descset layout from filamat. [⚠️ **New Material Version**]
|
||||||
|
- matc non-functional change: Update GLSL postprocessor to
|
||||||
|
isolate calls to SPVRemap from calls to SPIRV-Cross.
|
||||||
|
|
||||||
|
|
||||||
## v1.59.5
|
## v1.59.5
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -59,6 +59,10 @@ add_library(smol-v STATIC IMPORTED)
|
|||||||
set_target_properties(smol-v PROPERTIES IMPORTED_LOCATION
|
set_target_properties(smol-v PROPERTIES IMPORTED_LOCATION
|
||||||
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libsmol-v.a)
|
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libsmol-v.a)
|
||||||
|
|
||||||
|
add_library(abseil STATIC IMPORTED)
|
||||||
|
set_target_properties(abseil PROPERTIES IMPORTED_LOCATION
|
||||||
|
${FILAMENT_DIR}/lib/${ANDROID_ABI}/libabseil.a)
|
||||||
|
|
||||||
if (FILAMENT_ENABLE_FGVIEWER)
|
if (FILAMENT_ENABLE_FGVIEWER)
|
||||||
add_library(fgviewer STATIC IMPORTED)
|
add_library(fgviewer STATIC IMPORTED)
|
||||||
set_target_properties(fgviewer PROPERTIES IMPORTED_LOCATION
|
set_target_properties(fgviewer PROPERTIES IMPORTED_LOCATION
|
||||||
@@ -128,6 +132,7 @@ target_link_libraries(filament-jni
|
|||||||
PRIVATE jnigraphics
|
PRIVATE jnigraphics
|
||||||
PRIVATE utils
|
PRIVATE utils
|
||||||
PRIVATE perfetto
|
PRIVATE perfetto
|
||||||
|
PRIVATE abseil
|
||||||
|
|
||||||
# libgeometry is PUBLIC because gltfio uses it.
|
# libgeometry is PUBLIC because gltfio uses it.
|
||||||
PUBLIC geometry
|
PUBLIC geometry
|
||||||
|
|||||||
@@ -556,7 +556,8 @@ extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBu
|
|||||||
jlong resourceAllocatorCacheSizeMB, jlong resourceAllocatorCacheMaxAge,
|
jlong resourceAllocatorCacheSizeMB, jlong resourceAllocatorCacheMaxAge,
|
||||||
jboolean disableHandleUseAfterFreeCheck,
|
jboolean disableHandleUseAfterFreeCheck,
|
||||||
jint preferredShaderLanguage,
|
jint preferredShaderLanguage,
|
||||||
jboolean forceGLES2Context, jboolean assertNativeWindowIsValid) {
|
jboolean forceGLES2Context, jboolean assertNativeWindowIsValid,
|
||||||
|
jint gpuContextPriority) {
|
||||||
Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
|
Engine::Builder* builder = (Engine::Builder*) nativeBuilder;
|
||||||
Engine::Config config = {
|
Engine::Config config = {
|
||||||
.commandBufferSizeMB = (uint32_t) commandBufferSizeMB,
|
.commandBufferSizeMB = (uint32_t) commandBufferSizeMB,
|
||||||
@@ -574,6 +575,7 @@ extern "C" JNIEXPORT void JNICALL Java_com_google_android_filament_Engine_nSetBu
|
|||||||
.preferredShaderLanguage = (Engine::Config::ShaderLanguage) preferredShaderLanguage,
|
.preferredShaderLanguage = (Engine::Config::ShaderLanguage) preferredShaderLanguage,
|
||||||
.forceGLES2Context = (bool) forceGLES2Context,
|
.forceGLES2Context = (bool) forceGLES2Context,
|
||||||
.assertNativeWindowIsValid = (bool) assertNativeWindowIsValid,
|
.assertNativeWindowIsValid = (bool) assertNativeWindowIsValid,
|
||||||
|
.gpuContextPriority = (Engine::GpuContextPriority) gpuContextPriority,
|
||||||
};
|
};
|
||||||
builder->config(&config);
|
builder->config(&config);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -175,6 +175,36 @@ public class Engine {
|
|||||||
MULTIVIEW,
|
MULTIVIEW,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This controls the priority level for GPU work scheduling, which helps prioritize the
|
||||||
|
* submitted GPU work and enables preemption.
|
||||||
|
*/
|
||||||
|
public enum GpuContextPriority {
|
||||||
|
/**
|
||||||
|
* Backend default GPU context priority (typically MEDIUM)
|
||||||
|
*/
|
||||||
|
DEFAULT,
|
||||||
|
/**
|
||||||
|
* For non-interactive, deferrable workloads. This should not interfere with standard
|
||||||
|
* applications.
|
||||||
|
*/
|
||||||
|
LOW,
|
||||||
|
/**
|
||||||
|
* The default priority level for standard applications.
|
||||||
|
*/
|
||||||
|
MEDIUM,
|
||||||
|
/**
|
||||||
|
* For high-priority, latency-sensitive workloads that are more important than standard
|
||||||
|
* applications.
|
||||||
|
*/
|
||||||
|
HIGH,
|
||||||
|
/**
|
||||||
|
* The highest priority, intended for system-critical, real-time applications where missing
|
||||||
|
* deadlines is unacceptable (e.g., VR/AR compositors or other system-critical tasks).
|
||||||
|
*/
|
||||||
|
REALTIME,
|
||||||
|
};
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Constructs <code>Engine</code> objects using a builder pattern.
|
* Constructs <code>Engine</code> objects using a builder pattern.
|
||||||
*/
|
*/
|
||||||
@@ -233,7 +263,8 @@ public class Engine {
|
|||||||
config.resourceAllocatorCacheSizeMB, config.resourceAllocatorCacheMaxAge,
|
config.resourceAllocatorCacheSizeMB, config.resourceAllocatorCacheMaxAge,
|
||||||
config.disableHandleUseAfterFreeCheck,
|
config.disableHandleUseAfterFreeCheck,
|
||||||
config.preferredShaderLanguage.ordinal(),
|
config.preferredShaderLanguage.ordinal(),
|
||||||
config.forceGLES2Context, config.assertNativeWindowIsValid);
|
config.forceGLES2Context, config.assertNativeWindowIsValid,
|
||||||
|
config.gpuContextPriority.ordinal());
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -489,6 +520,11 @@ public class Engine {
|
|||||||
* @Deprecated use "backend.opengl.assert_native_window_is_valid" feature flag instead
|
* @Deprecated use "backend.opengl.assert_native_window_is_valid" feature flag instead
|
||||||
*/
|
*/
|
||||||
public boolean assertNativeWindowIsValid = false;
|
public boolean assertNativeWindowIsValid = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GPU context priority level. Controls GPU work scheduling and preemption.
|
||||||
|
*/
|
||||||
|
public GpuContextPriority gpuContextPriority = GpuContextPriority.DEFAULT;
|
||||||
}
|
}
|
||||||
|
|
||||||
private Engine(long nativeEngine, Config config) {
|
private Engine(long nativeEngine, Config config) {
|
||||||
@@ -1492,7 +1528,8 @@ public class Engine {
|
|||||||
long resourceAllocatorCacheSizeMB, long resourceAllocatorCacheMaxAge,
|
long resourceAllocatorCacheSizeMB, long resourceAllocatorCacheMaxAge,
|
||||||
boolean disableHandleUseAfterFreeCheck,
|
boolean disableHandleUseAfterFreeCheck,
|
||||||
int preferredShaderLanguage,
|
int preferredShaderLanguage,
|
||||||
boolean forceGLES2Context, boolean assertNativeWindowIsValid);
|
boolean forceGLES2Context, boolean assertNativeWindowIsValid,
|
||||||
|
int gpuContextPriority);
|
||||||
private static native void nSetBuilderFeatureLevel(long nativeBuilder, int ordinal);
|
private static native void nSetBuilderFeatureLevel(long nativeBuilder, int ordinal);
|
||||||
private static native void nSetBuilderSharedContext(long nativeBuilder, long sharedContext);
|
private static native void nSetBuilderSharedContext(long nativeBuilder, long sharedContext);
|
||||||
private static native void nSetBuilderPaused(long nativeBuilder, boolean paused);
|
private static native void nSetBuilderPaused(long nativeBuilder, boolean paused);
|
||||||
|
|||||||
@@ -1801,6 +1801,22 @@ public class View {
|
|||||||
* @see setAmbientOcclusionOptions()
|
* @see setAmbientOcclusionOptions()
|
||||||
*/
|
*/
|
||||||
public static class AmbientOcclusionOptions {
|
public static class AmbientOcclusionOptions {
|
||||||
|
public enum AmbientOcclusionType {
|
||||||
|
/**
|
||||||
|
* use Scalable Ambient Occlusion
|
||||||
|
*/
|
||||||
|
SAO,
|
||||||
|
/**
|
||||||
|
* use Ground Truth-Based Ambient Occlusion
|
||||||
|
*/
|
||||||
|
GTAO,
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Type of ambient occlusion algorithm.
|
||||||
|
*/
|
||||||
|
@NonNull
|
||||||
|
public AmbientOcclusionOptions.AmbientOcclusionType aoType = AmbientOcclusionOptions.AmbientOcclusionType.SAO;
|
||||||
/**
|
/**
|
||||||
* Ambient Occlusion radius in meters, between 0 and ~10.
|
* Ambient Occlusion radius in meters, between 0 and ~10.
|
||||||
*/
|
*/
|
||||||
@@ -1810,7 +1826,8 @@ public class View {
|
|||||||
*/
|
*/
|
||||||
public float power = 1.0f;
|
public float power = 1.0f;
|
||||||
/**
|
/**
|
||||||
* Self-occlusion bias in meters. Use to avoid self-occlusion. Between 0 and a few mm.
|
* Self-occlusion bias in meters. Use to avoid self-occlusion.
|
||||||
|
* Between 0 and a few mm. No effect when aoType set to GTAO
|
||||||
*/
|
*/
|
||||||
public float bias = 0.0005f;
|
public float bias = 0.0005f;
|
||||||
/**
|
/**
|
||||||
@@ -1826,12 +1843,12 @@ public class View {
|
|||||||
*/
|
*/
|
||||||
public float bilateralThreshold = 0.05f;
|
public float bilateralThreshold = 0.05f;
|
||||||
/**
|
/**
|
||||||
* affects # of samples used for AO.
|
* affects # of samples used for AO and params for filtering
|
||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public QualityLevel quality = QualityLevel.LOW;
|
public QualityLevel quality = QualityLevel.LOW;
|
||||||
/**
|
/**
|
||||||
* affects AO smoothness
|
* affects AO smoothness. Recommend setting to HIGH when aoType set to GTAO.
|
||||||
*/
|
*/
|
||||||
@NonNull
|
@NonNull
|
||||||
public QualityLevel lowPassFilter = QualityLevel.MEDIUM;
|
public QualityLevel lowPassFilter = QualityLevel.MEDIUM;
|
||||||
@@ -1849,7 +1866,7 @@ public class View {
|
|||||||
*/
|
*/
|
||||||
public boolean bentNormals = false;
|
public boolean bentNormals = false;
|
||||||
/**
|
/**
|
||||||
* min angle in radian to consider
|
* min angle in radian to consider. No effect when aoType set to GTAO.
|
||||||
*/
|
*/
|
||||||
public float minHorizonAngleRad = 0.0f;
|
public float minHorizonAngleRad = 0.0f;
|
||||||
/**
|
/**
|
||||||
@@ -1904,6 +1921,19 @@ public class View {
|
|||||||
*/
|
*/
|
||||||
public boolean ssctEnabled = false;
|
public boolean ssctEnabled = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Ground Truth-base Ambient Occlusion (GTAO) options
|
||||||
|
*/
|
||||||
|
public int gtaoSampleSliceCount = 4;
|
||||||
|
/**
|
||||||
|
* Ground Truth-base Ambient Occlusion (GTAO) options
|
||||||
|
*/
|
||||||
|
public int gtaoSampleStepsPerSlice = 3;
|
||||||
|
/**
|
||||||
|
* Ground Truth-base Ambient Occlusion (GTAO) options
|
||||||
|
*/
|
||||||
|
public float gtaoThicknessHeuristic = 0.004f;
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
GROUP=com.google.android.filament
|
GROUP=com.google.android.filament
|
||||||
VERSION_NAME=1.59.4
|
VERSION_NAME=1.62.0
|
||||||
|
|
||||||
POM_DESCRIPTION=Real-time physically based rendering engine for Android.
|
POM_DESCRIPTION=Real-time physically based rendering engine for Android.
|
||||||
|
|
||||||
|
|||||||
BIN
Binary file not shown.
+2
-1
@@ -1,6 +1,7 @@
|
|||||||
#Wed Nov 17 10:40:18 PST 2021
|
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
|
||||||
|
networkTimeout=10000
|
||||||
|
validateDistributionUrl=true
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
|
|||||||
Vendored
+179
-115
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env sh
|
#!/bin/sh
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2015 the original author or authors.
|
# Copyright © 2015-2021 the original authors.
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -17,67 +17,99 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
##############################################################################
|
##############################################################################
|
||||||
##
|
#
|
||||||
## Gradle start up script for UN*X
|
# Gradle start up script for POSIX generated by Gradle.
|
||||||
##
|
#
|
||||||
|
# Important for running:
|
||||||
|
#
|
||||||
|
# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
|
||||||
|
# noncompliant, but you have some other compliant shell such as ksh or
|
||||||
|
# bash, then to run this script, type that shell name before the whole
|
||||||
|
# command line, like:
|
||||||
|
#
|
||||||
|
# ksh Gradle
|
||||||
|
#
|
||||||
|
# Busybox and similar reduced shells will NOT work, because this script
|
||||||
|
# requires all of these POSIX shell features:
|
||||||
|
# * functions;
|
||||||
|
# * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
|
||||||
|
# «${var#prefix}», «${var%suffix}», and «$( cmd )»;
|
||||||
|
# * compound commands having a testable exit status, especially «case»;
|
||||||
|
# * various built-in commands including «command», «set», and «ulimit».
|
||||||
|
#
|
||||||
|
# Important for patching:
|
||||||
|
#
|
||||||
|
# (2) This script targets any POSIX shell, so it avoids extensions provided
|
||||||
|
# by Bash, Ksh, etc; in particular arrays are avoided.
|
||||||
|
#
|
||||||
|
# The "traditional" practice of packing multiple parameters into a
|
||||||
|
# space-separated string is a well documented source of bugs and security
|
||||||
|
# problems, so this is (mostly) avoided, by progressively accumulating
|
||||||
|
# options in "$@", and eventually passing that to Java.
|
||||||
|
#
|
||||||
|
# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
|
||||||
|
# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
|
||||||
|
# see the in-line comments for details.
|
||||||
|
#
|
||||||
|
# There are tweaks for specific operating systems such as AIX, CygWin,
|
||||||
|
# Darwin, MinGW, and NonStop.
|
||||||
|
#
|
||||||
|
# (3) This script is generated from the Groovy template
|
||||||
|
# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
|
||||||
|
# within the Gradle project.
|
||||||
|
#
|
||||||
|
# You can find Gradle at https://github.com/gradle/gradle/.
|
||||||
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
# Attempt to set APP_HOME
|
# Attempt to set APP_HOME
|
||||||
|
|
||||||
# Resolve links: $0 may be a link
|
# Resolve links: $0 may be a link
|
||||||
PRG="$0"
|
app_path=$0
|
||||||
# Need this for relative symlinks.
|
|
||||||
while [ -h "$PRG" ] ; do
|
# Need this for daisy-chained symlinks.
|
||||||
ls=`ls -ld "$PRG"`
|
while
|
||||||
link=`expr "$ls" : '.*-> \(.*\)$'`
|
APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path
|
||||||
if expr "$link" : '/.*' > /dev/null; then
|
[ -h "$app_path" ]
|
||||||
PRG="$link"
|
do
|
||||||
else
|
ls=$( ls -ld "$app_path" )
|
||||||
PRG=`dirname "$PRG"`"/$link"
|
link=${ls#*' -> '}
|
||||||
fi
|
case $link in #(
|
||||||
|
/*) app_path=$link ;; #(
|
||||||
|
*) app_path=$APP_HOME$link ;;
|
||||||
|
esac
|
||||||
done
|
done
|
||||||
SAVED="`pwd`"
|
|
||||||
cd "`dirname \"$PRG\"`/" >/dev/null
|
|
||||||
APP_HOME="`pwd -P`"
|
|
||||||
cd "$SAVED" >/dev/null
|
|
||||||
|
|
||||||
APP_NAME="Gradle"
|
# This is normally unused
|
||||||
APP_BASE_NAME=`basename "$0"`
|
# shellcheck disable=SC2034
|
||||||
|
APP_BASE_NAME=${0##*/}
|
||||||
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
|
||||||
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
|
||||||
|
|
||||||
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
# Use the maximum available, or set MAX_FD != -1 to use that value.
|
||||||
MAX_FD="maximum"
|
MAX_FD=maximum
|
||||||
|
|
||||||
warn () {
|
warn () {
|
||||||
echo "$*"
|
echo "$*"
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
die () {
|
die () {
|
||||||
echo
|
echo
|
||||||
echo "$*"
|
echo "$*"
|
||||||
echo
|
echo
|
||||||
exit 1
|
exit 1
|
||||||
}
|
} >&2
|
||||||
|
|
||||||
# OS specific support (must be 'true' or 'false').
|
# OS specific support (must be 'true' or 'false').
|
||||||
cygwin=false
|
cygwin=false
|
||||||
msys=false
|
msys=false
|
||||||
darwin=false
|
darwin=false
|
||||||
nonstop=false
|
nonstop=false
|
||||||
case "`uname`" in
|
case "$( uname )" in #(
|
||||||
CYGWIN* )
|
CYGWIN* ) cygwin=true ;; #(
|
||||||
cygwin=true
|
Darwin* ) darwin=true ;; #(
|
||||||
;;
|
MSYS* | MINGW* ) msys=true ;; #(
|
||||||
Darwin* )
|
NONSTOP* ) nonstop=true ;;
|
||||||
darwin=true
|
|
||||||
;;
|
|
||||||
MINGW* )
|
|
||||||
msys=true
|
|
||||||
;;
|
|
||||||
NONSTOP* )
|
|
||||||
nonstop=true
|
|
||||||
;;
|
|
||||||
esac
|
esac
|
||||||
|
|
||||||
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
||||||
@@ -87,9 +119,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
|
|||||||
if [ -n "$JAVA_HOME" ] ; then
|
if [ -n "$JAVA_HOME" ] ; then
|
||||||
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
|
||||||
# IBM's JDK on AIX uses strange locations for the executables
|
# IBM's JDK on AIX uses strange locations for the executables
|
||||||
JAVACMD="$JAVA_HOME/jre/sh/java"
|
JAVACMD=$JAVA_HOME/jre/sh/java
|
||||||
else
|
else
|
||||||
JAVACMD="$JAVA_HOME/bin/java"
|
JAVACMD=$JAVA_HOME/bin/java
|
||||||
fi
|
fi
|
||||||
if [ ! -x "$JAVACMD" ] ; then
|
if [ ! -x "$JAVACMD" ] ; then
|
||||||
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
|
||||||
@@ -98,88 +130,120 @@ Please set the JAVA_HOME variable in your environment to match the
|
|||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
JAVACMD="java"
|
JAVACMD=java
|
||||||
which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
if ! command -v java >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
||||||
|
|
||||||
Please set the JAVA_HOME variable in your environment to match the
|
Please set the JAVA_HOME variable in your environment to match the
|
||||||
location of your Java installation."
|
location of your Java installation."
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Increase the maximum file descriptors if we can.
|
# Increase the maximum file descriptors if we can.
|
||||||
if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
|
if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
|
||||||
MAX_FD_LIMIT=`ulimit -H -n`
|
case $MAX_FD in #(
|
||||||
if [ $? -eq 0 ] ; then
|
max*)
|
||||||
if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
|
# In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
|
||||||
MAX_FD="$MAX_FD_LIMIT"
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
MAX_FD=$( ulimit -H -n ) ||
|
||||||
ulimit -n $MAX_FD
|
warn "Could not query maximum file descriptor limit"
|
||||||
if [ $? -ne 0 ] ; then
|
esac
|
||||||
warn "Could not set maximum file descriptor limit: $MAX_FD"
|
case $MAX_FD in #(
|
||||||
fi
|
'' | soft) :;; #(
|
||||||
else
|
*)
|
||||||
warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
|
# In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
|
||||||
fi
|
# shellcheck disable=SC2039,SC3045
|
||||||
fi
|
ulimit -n "$MAX_FD" ||
|
||||||
|
warn "Could not set maximum file descriptor limit to $MAX_FD"
|
||||||
# For Darwin, add options to specify how the application appears in the dock
|
|
||||||
if $darwin; then
|
|
||||||
GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
|
|
||||||
fi
|
|
||||||
|
|
||||||
# For Cygwin or MSYS, switch paths to Windows format before running java
|
|
||||||
if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
|
|
||||||
APP_HOME=`cygpath --path --mixed "$APP_HOME"`
|
|
||||||
CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
|
|
||||||
|
|
||||||
JAVACMD=`cygpath --unix "$JAVACMD"`
|
|
||||||
|
|
||||||
# We build the pattern for arguments to be converted via cygpath
|
|
||||||
ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
|
|
||||||
SEP=""
|
|
||||||
for dir in $ROOTDIRSRAW ; do
|
|
||||||
ROOTDIRS="$ROOTDIRS$SEP$dir"
|
|
||||||
SEP="|"
|
|
||||||
done
|
|
||||||
OURCYGPATTERN="(^($ROOTDIRS))"
|
|
||||||
# Add a user-defined pattern to the cygpath arguments
|
|
||||||
if [ "$GRADLE_CYGPATTERN" != "" ] ; then
|
|
||||||
OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
|
|
||||||
fi
|
|
||||||
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
|
||||||
i=0
|
|
||||||
for arg in "$@" ; do
|
|
||||||
CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
|
|
||||||
CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option
|
|
||||||
|
|
||||||
if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition
|
|
||||||
eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
|
|
||||||
else
|
|
||||||
eval `echo args$i`="\"$arg\""
|
|
||||||
fi
|
|
||||||
i=`expr $i + 1`
|
|
||||||
done
|
|
||||||
case $i in
|
|
||||||
0) set -- ;;
|
|
||||||
1) set -- "$args0" ;;
|
|
||||||
2) set -- "$args0" "$args1" ;;
|
|
||||||
3) set -- "$args0" "$args1" "$args2" ;;
|
|
||||||
4) set -- "$args0" "$args1" "$args2" "$args3" ;;
|
|
||||||
5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
|
|
||||||
6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
|
|
||||||
7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
|
|
||||||
8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
|
|
||||||
9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
|
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Escape application args
|
# Collect all arguments for the java command, stacking in reverse order:
|
||||||
save () {
|
# * args from the command line
|
||||||
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
|
# * the main class name
|
||||||
echo " "
|
# * -classpath
|
||||||
}
|
# * -D...appname settings
|
||||||
APP_ARGS=`save "$@"`
|
# * --module-path (only if needed)
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
|
||||||
|
|
||||||
# Collect all arguments for the java command, following the shell quoting and substitution rules
|
# For Cygwin or MSYS, switch paths to Windows format before running java
|
||||||
eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
|
if "$cygwin" || "$msys" ; then
|
||||||
|
APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
|
||||||
|
CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
|
||||||
|
|
||||||
|
JAVACMD=$( cygpath --unix "$JAVACMD" )
|
||||||
|
|
||||||
|
# Now convert the arguments - kludge to limit ourselves to /bin/sh
|
||||||
|
for arg do
|
||||||
|
if
|
||||||
|
case $arg in #(
|
||||||
|
-*) false ;; # don't mess with options #(
|
||||||
|
/?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath
|
||||||
|
[ -e "$t" ] ;; #(
|
||||||
|
*) false ;;
|
||||||
|
esac
|
||||||
|
then
|
||||||
|
arg=$( cygpath --path --ignore --mixed "$arg" )
|
||||||
|
fi
|
||||||
|
# Roll the args list around exactly as many times as the number of
|
||||||
|
# args, so each arg winds up back in the position where it started, but
|
||||||
|
# possibly modified.
|
||||||
|
#
|
||||||
|
# NB: a `for` loop captures its iteration list before it begins, so
|
||||||
|
# changing the positional parameters here affects neither the number of
|
||||||
|
# iterations, nor the values presented in `arg`.
|
||||||
|
shift # remove old arg
|
||||||
|
set -- "$@" "$arg" # push replacement arg
|
||||||
|
done
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
|
# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
|
||||||
|
DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
|
||||||
|
|
||||||
|
# Collect all arguments for the java command:
|
||||||
|
# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
|
||||||
|
# and any embedded shellness will be escaped.
|
||||||
|
# * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
|
||||||
|
# treated as '${Hostname}' itself on the command line.
|
||||||
|
|
||||||
|
set -- \
|
||||||
|
"-Dorg.gradle.appname=$APP_BASE_NAME" \
|
||||||
|
-classpath "$CLASSPATH" \
|
||||||
|
org.gradle.wrapper.GradleWrapperMain \
|
||||||
|
"$@"
|
||||||
|
|
||||||
|
# Stop when "xargs" is not available.
|
||||||
|
if ! command -v xargs >/dev/null 2>&1
|
||||||
|
then
|
||||||
|
die "xargs is not available"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Use "xargs" to parse quoted args.
|
||||||
|
#
|
||||||
|
# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
|
||||||
|
#
|
||||||
|
# In Bash we could simply go:
|
||||||
|
#
|
||||||
|
# readarray ARGS < <( xargs -n1 <<<"$var" ) &&
|
||||||
|
# set -- "${ARGS[@]}" "$@"
|
||||||
|
#
|
||||||
|
# but POSIX shell has neither arrays nor command substitution, so instead we
|
||||||
|
# post-process each arg (as a line of input to sed) to backslash-escape any
|
||||||
|
# character that might be a shell metacharacter, then use eval to reverse
|
||||||
|
# that process (while maintaining the separation between arguments), and wrap
|
||||||
|
# the whole thing up as a single "set" statement.
|
||||||
|
#
|
||||||
|
# This will of course break if any of these variables contains a newline or
|
||||||
|
# an unmatched quote.
|
||||||
|
#
|
||||||
|
|
||||||
|
eval "set -- $(
|
||||||
|
printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
|
||||||
|
xargs -n1 |
|
||||||
|
sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
|
||||||
|
tr '\n' ' '
|
||||||
|
)" '"$@"'
|
||||||
|
|
||||||
exec "$JAVACMD" "$@"
|
exec "$JAVACMD" "$@"
|
||||||
|
|||||||
Vendored
+19
-16
@@ -14,7 +14,7 @@
|
|||||||
@rem limitations under the License.
|
@rem limitations under the License.
|
||||||
@rem
|
@rem
|
||||||
|
|
||||||
@if "%DEBUG%" == "" @echo off
|
@if "%DEBUG%"=="" @echo off
|
||||||
@rem ##########################################################################
|
@rem ##########################################################################
|
||||||
@rem
|
@rem
|
||||||
@rem Gradle startup script for Windows
|
@rem Gradle startup script for Windows
|
||||||
@@ -25,7 +25,8 @@
|
|||||||
if "%OS%"=="Windows_NT" setlocal
|
if "%OS%"=="Windows_NT" setlocal
|
||||||
|
|
||||||
set DIRNAME=%~dp0
|
set DIRNAME=%~dp0
|
||||||
if "%DIRNAME%" == "" set DIRNAME=.
|
if "%DIRNAME%"=="" set DIRNAME=.
|
||||||
|
@rem This is normally unused
|
||||||
set APP_BASE_NAME=%~n0
|
set APP_BASE_NAME=%~n0
|
||||||
set APP_HOME=%DIRNAME%
|
set APP_HOME=%DIRNAME%
|
||||||
|
|
||||||
@@ -40,13 +41,13 @@ if defined JAVA_HOME goto findJavaFromJavaHome
|
|||||||
|
|
||||||
set JAVA_EXE=java.exe
|
set JAVA_EXE=java.exe
|
||||||
%JAVA_EXE% -version >NUL 2>&1
|
%JAVA_EXE% -version >NUL 2>&1
|
||||||
if "%ERRORLEVEL%" == "0" goto execute
|
if %ERRORLEVEL% equ 0 goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
|
echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
|
|||||||
|
|
||||||
if exist "%JAVA_EXE%" goto execute
|
if exist "%JAVA_EXE%" goto execute
|
||||||
|
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
|
echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
|
||||||
echo.
|
echo. 1>&2
|
||||||
echo Please set the JAVA_HOME variable in your environment to match the
|
echo Please set the JAVA_HOME variable in your environment to match the 1>&2
|
||||||
echo location of your Java installation.
|
echo location of your Java installation. 1>&2
|
||||||
|
|
||||||
goto fail
|
goto fail
|
||||||
|
|
||||||
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
|
|||||||
|
|
||||||
:end
|
:end
|
||||||
@rem End local scope for the variables with windows NT shell
|
@rem End local scope for the variables with windows NT shell
|
||||||
if "%ERRORLEVEL%"=="0" goto mainEnd
|
if %ERRORLEVEL% equ 0 goto mainEnd
|
||||||
|
|
||||||
:fail
|
:fail
|
||||||
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
|
||||||
rem the _cmd.exe /c_ return code!
|
rem the _cmd.exe /c_ return code!
|
||||||
if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
|
set EXIT_CODE=%ERRORLEVEL%
|
||||||
exit /b 1
|
if %EXIT_CODE% equ 0 set EXIT_CODE=1
|
||||||
|
if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
|
||||||
|
exit /b %EXIT_CODE%
|
||||||
|
|
||||||
:mainEnd
|
:mainEnd
|
||||||
if "%OS%"=="Windows_NT" endlocal
|
if "%OS%"=="Windows_NT" endlocal
|
||||||
|
|||||||
Binary file not shown.
+19
-1
@@ -18,6 +18,7 @@ package com.google.android.filament.gltf
|
|||||||
|
|
||||||
import android.annotation.SuppressLint
|
import android.annotation.SuppressLint
|
||||||
import android.app.Activity
|
import android.app.Activity
|
||||||
|
import android.content.Intent
|
||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.util.Log
|
import android.util.Log
|
||||||
import android.view.*
|
import android.view.*
|
||||||
@@ -50,6 +51,7 @@ class MainActivity : Activity() {
|
|||||||
// Load the library for the utility layer, which in turn loads gltfio and the Filament core.
|
// Load the library for the utility layer, which in turn loads gltfio and the Filament core.
|
||||||
init { Utils.init() }
|
init { Utils.init() }
|
||||||
private const val TAG = "gltf-viewer"
|
private const val TAG = "gltf-viewer"
|
||||||
|
private const val STATIC_MODEL_TAG = "use-static-model"
|
||||||
}
|
}
|
||||||
|
|
||||||
private lateinit var surfaceView: SurfaceView
|
private lateinit var surfaceView: SurfaceView
|
||||||
@@ -69,6 +71,7 @@ class MainActivity : Activity() {
|
|||||||
private var loadStartTime = 0L
|
private var loadStartTime = 0L
|
||||||
private var loadStartFence: Fence? = null
|
private var loadStartFence: Fence? = null
|
||||||
private val viewerContent = AutomationEngine.ViewerContent()
|
private val viewerContent = AutomationEngine.ViewerContent()
|
||||||
|
private var useStaticModel = false
|
||||||
|
|
||||||
@SuppressLint("ClickableViewAccessibility")
|
@SuppressLint("ClickableViewAccessibility")
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
override fun onCreate(savedInstanceState: Bundle?) {
|
||||||
@@ -83,6 +86,12 @@ class MainActivity : Activity() {
|
|||||||
doubleTapDetector = GestureDetector(applicationContext, doubleTapListener)
|
doubleTapDetector = GestureDetector(applicationContext, doubleTapListener)
|
||||||
singleTapDetector = GestureDetector(applicationContext, singleTapListener)
|
singleTapDetector = GestureDetector(applicationContext, singleTapListener)
|
||||||
|
|
||||||
|
val intent: Intent = intent
|
||||||
|
val bundle: Bundle? = intent.extras
|
||||||
|
bundle?.let {
|
||||||
|
useStaticModel = it.getBoolean(STATIC_MODEL_TAG, false)
|
||||||
|
}
|
||||||
|
|
||||||
modelViewer = ModelViewer(surfaceView)
|
modelViewer = ModelViewer(surfaceView)
|
||||||
viewerContent.view = modelViewer.view
|
viewerContent.view = modelViewer.view
|
||||||
viewerContent.sunlight = modelViewer.light
|
viewerContent.sunlight = modelViewer.light
|
||||||
@@ -141,7 +150,16 @@ class MainActivity : Activity() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun createDefaultRenderables() {
|
private fun createDefaultRenderables() {
|
||||||
val buffer = assets.open("models/scene.gltf").use { input ->
|
// Sometimes it's useful to set to the default model to something static. You can enable
|
||||||
|
// the static model by launching the app from adb, as in
|
||||||
|
// `adb shell am start -n com.google.android.filament.gltf/.MainActivity --ez "use-static-model" true`
|
||||||
|
val modelPath = if (useStaticModel) {
|
||||||
|
"models/helmet.glb"
|
||||||
|
} else {
|
||||||
|
"models/scene.gltf"
|
||||||
|
}
|
||||||
|
|
||||||
|
val buffer = assets.open(modelPath).use { input ->
|
||||||
val bytes = ByteArray(input.available())
|
val bytes = ByteArray(input.available())
|
||||||
input.read(bytes)
|
input.read(bytes)
|
||||||
ByteBuffer.wrap(bytes)
|
ByteBuffer.wrap(bytes)
|
||||||
|
|||||||
@@ -151,7 +151,7 @@ function print_fgviewer_help {
|
|||||||
}
|
}
|
||||||
|
|
||||||
# Unless explicitly specified, NDK version will be selected as highest available version within same major release chain
|
# Unless explicitly specified, NDK version will be selected as highest available version within same major release chain
|
||||||
FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION:-$(cat `dirname $0`/build/android/ndk.version | cut -f 1 -d ".")}
|
FILAMENT_NDK_VERSION=${FILAMENT_NDK_VERSION:-$(cat `dirname $0`/build/common/versions | grep GITHUB_NDK_VERSION | sed s/GITHUB_NDK_VERSION=//g | cut -f 1 -d ".")}
|
||||||
|
|
||||||
# Requirements
|
# Requirements
|
||||||
CMAKE_MAJOR=3
|
CMAKE_MAJOR=3
|
||||||
@@ -463,16 +463,6 @@ function ensure_android_build {
|
|||||||
echo "Error: Android NDK side-by-side version ${FILAMENT_NDK_VERSION} or compatible must be installed, exiting"
|
echo "Error: Android NDK side-by-side version ${FILAMENT_NDK_VERSION} or compatible must be installed, exiting"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
local cmake_version=$(cmake --version)
|
|
||||||
if [[ "${cmake_version}" =~ ([0-9]+)\.([0-9]+)\.[0-9]+ ]]; then
|
|
||||||
if [[ "${BASH_REMATCH[1]}" -lt "${CMAKE_MAJOR}" ]] || \
|
|
||||||
[[ "${BASH_REMATCH[2]}" -lt "${CMAKE_MINOR}" ]]; then
|
|
||||||
echo "Error: cmake version ${CMAKE_MAJOR}.${CMAKE_MINOR}+ is required," \
|
|
||||||
"${BASH_REMATCH[1]}.${BASH_REMATCH[2]} installed, exiting"
|
|
||||||
exit 1
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function build_android {
|
function build_android {
|
||||||
|
|||||||
+1
-28
@@ -1,28 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Usage: the first argument selects the build type:
|
source `dirname $0`/../common/ci-check.sh
|
||||||
# - release, to build release only
|
|
||||||
# - debug, to build debug only
|
|
||||||
# - continuous, to build release and debug
|
|
||||||
# - presubmit, for presubmit builds
|
|
||||||
#
|
|
||||||
# The default is release
|
|
||||||
|
|
||||||
echo "This script is intended to run in a CI environment and may modify your current environment."
|
|
||||||
echo "Please refer to BUILDING.md for more information."
|
|
||||||
|
|
||||||
read -r -p "Do you wish to proceed (y/n)? " choice
|
|
||||||
case "${choice}" in
|
|
||||||
y|Y)
|
|
||||||
echo "Build will proceed..."
|
|
||||||
;;
|
|
||||||
n|N)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
@@ -30,11 +8,6 @@ set -x
|
|||||||
UNAME=`echo $(uname)`
|
UNAME=`echo $(uname)`
|
||||||
LC_UNAME=`echo $UNAME | tr '[:upper:]' '[:lower:]'`
|
LC_UNAME=`echo $UNAME | tr '[:upper:]' '[:lower:]'`
|
||||||
|
|
||||||
# build-common.sh will generate the following variables:
|
|
||||||
# $GENERATE_ARCHIVES
|
|
||||||
# $BUILD_DEBUG
|
|
||||||
# $BUILD_RELEASE
|
|
||||||
source `dirname $0`/../common/ci-common.sh
|
|
||||||
source `dirname $0`/../common/build-common.sh
|
source `dirname $0`/../common/build-common.sh
|
||||||
|
|
||||||
if [[ "$GITHUB_WORKFLOW" ]]; then
|
if [[ "$GITHUB_WORKFLOW" ]]; then
|
||||||
|
|||||||
@@ -1,5 +1,20 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
|
# build-common.sh will generate the following variables:
|
||||||
|
# $GENERATE_ARCHIVES
|
||||||
|
# $BUILD_DEBUG
|
||||||
|
# $BUILD_RELEASE
|
||||||
|
|
||||||
|
# Typically a build script (build.sh) would source this script. For example,
|
||||||
|
# source `dirname $0`/../common/build-common.sh
|
||||||
|
|
||||||
|
# Usage: the first argument selects the build type:
|
||||||
|
# - release, to build release only
|
||||||
|
# - debug, to build debug only
|
||||||
|
# - continuous, to build release and debug
|
||||||
|
# - presubmit, for presubmit builds
|
||||||
|
#
|
||||||
|
# The default is release
|
||||||
if [[ ! "$TARGET" ]]; then
|
if [[ ! "$TARGET" ]]; then
|
||||||
if [[ "$1" ]]; then
|
if [[ "$1" ]]; then
|
||||||
TARGET=$1
|
TARGET=$1
|
||||||
|
|||||||
@@ -0,0 +1,19 @@
|
|||||||
|
echo "This script is intended to run in a CI environment and may modify your current environment."
|
||||||
|
echo "Please refer to BUILDING.md for more information."
|
||||||
|
|
||||||
|
read -r -p "Do you wish to proceed (y/n)? " choice
|
||||||
|
case "${choice}" in
|
||||||
|
y|Y)
|
||||||
|
echo "Build will proceed..."
|
||||||
|
;;
|
||||||
|
n|N)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
exit 0
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
if [[ "$GITHUB_WORKFLOW" ]]; then
|
||||||
|
echo "Running workflow $GITHUB_WORKFLOW (event: $GITHUB_EVENT_NAME, action: $GITHUB_ACTION)"
|
||||||
|
fi
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
if [[ "$GITHUB_WORKFLOW" ]]; then
|
|
||||||
echo "Running workflow $GITHUB_WORKFLOW (event: $GITHUB_EVENT_NAME, action: $GITHUB_ACTION)"
|
|
||||||
fi
|
|
||||||
Executable
+22
@@ -0,0 +1,22 @@
|
|||||||
|
#!/bin/bash
|
||||||
|
|
||||||
|
if [ -d "./emsdk" ]; then
|
||||||
|
echo "emsdk folder found. Assume emsdk has been installed."
|
||||||
|
cd emsdk
|
||||||
|
./emsdk activate latest
|
||||||
|
source ./emsdk_env.sh
|
||||||
|
export EMSDK="$PWD"
|
||||||
|
cd ..
|
||||||
|
exit 0
|
||||||
|
fi
|
||||||
|
|
||||||
|
# Install emscripten.
|
||||||
|
EMSDK_VERSION=${GITHUB_EMSDK_VERSION-3.1.60}
|
||||||
|
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/${EMSDK_VERSION}.zip > emsdk.zip
|
||||||
|
unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
|
||||||
|
./emsdk install latest
|
||||||
|
./emsdk activate latest
|
||||||
|
source ./emsdk_env.sh
|
||||||
|
|
||||||
|
export EMSDK="$PWD"
|
||||||
|
cd ..
|
||||||
@@ -14,9 +14,9 @@
|
|||||||
|
|
||||||
#!/usr/bin/bash
|
#!/usr/bin/bash
|
||||||
|
|
||||||
set -x
|
set -e
|
||||||
if [[ "$GITHUB_WORKFLOW" ]]; then
|
if [[ "$GITHUB_WORKFLOW" ]]; then
|
||||||
set -e
|
set -x
|
||||||
fi
|
fi
|
||||||
|
|
||||||
OS_NAME=$(uname -s)
|
OS_NAME=$(uname -s)
|
||||||
@@ -35,12 +35,14 @@ source ${ORIG_DIR}/venv/bin/activate
|
|||||||
|
|
||||||
NEEDED_PYTHON_DEPS=("mako" "setuptools" "pyyaml")
|
NEEDED_PYTHON_DEPS=("mako" "setuptools" "pyyaml")
|
||||||
for cmd in "${NEEDED_PYTHON_DEPS[@]}"; do
|
for cmd in "${NEEDED_PYTHON_DEPS[@]}"; do
|
||||||
if ! python3 -m pip show "${cmd}" >/dev/null 2>&1; then
|
if ! python3 -m pip show -q "${cmd}" >/dev/null 2>&1; then
|
||||||
python3 -m pip install ${cmd}
|
python3 -m pip install ${cmd}
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
deactivate
|
deactivate
|
||||||
|
|
||||||
|
LOCAL_PKG_CONFIG_PATH=
|
||||||
|
|
||||||
# Install system deps
|
# Install system deps
|
||||||
if [[ "$OS_NAME" == "Linux" ]]; then
|
if [[ "$OS_NAME" == "Linux" ]]; then
|
||||||
if [[ "$GITHUB_WORKFLOW" ]]; then
|
if [[ "$GITHUB_WORKFLOW" ]]; then
|
||||||
@@ -82,6 +84,9 @@ elif [[ "$OS_NAME" == "Darwin" ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install autoconf automake libx11 libxext libxrandr llvm@${LLVM_VERSION} ninja meson pkg-config libxshmfence
|
HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=true brew install autoconf automake libx11 libxext libxrandr llvm@${LLVM_VERSION} ninja meson pkg-config libxshmfence
|
||||||
|
|
||||||
|
# For reasons unknown, this is necessary for pkg-config to find homebrew's packages
|
||||||
|
LOCAL_PKG_CONFIG_PATH="/opt/homebrew/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
fi # [[ "$OS_NAME" == x ]]
|
fi # [[ "$OS_NAME" == x ]]
|
||||||
|
|
||||||
LOCAL_LDFLAGS=${LDFLAGS}
|
LOCAL_LDFLAGS=${LDFLAGS}
|
||||||
@@ -134,9 +139,11 @@ fi
|
|||||||
# -Dgallium-drivers=swrast => builds GL software rasterizer
|
# -Dgallium-drivers=swrast => builds GL software rasterizer
|
||||||
# -Dvulkan-drivers=swrast => builds VK software rasterizer
|
# -Dvulkan-drivers=swrast => builds VK software rasterizer
|
||||||
# -Dgallium-drivers=llvmpipe is needed for GL >= 4.1 pipe-screen (see src/gallium/auxiliary/target-helpers/inline_sw_helper.h)
|
# -Dgallium-drivers=llvmpipe is needed for GL >= 4.1 pipe-screen (see src/gallium/auxiliary/target-helpers/inline_sw_helper.h)
|
||||||
CXX=${LOCAL_CXX} CC=${LOCAL_CC} PATH=${LOCAL_PATH} LDFLAGS=${LOCAL_LDFLAGS} CPPFLAGS=${LOCAL_CPPFLAGS} \
|
PKG_CONFIG_PATH=${LOCAL_PKG_CONFIG_PATH} PATH=${LOCAL_PATH} \
|
||||||
|
CXX=${LOCAL_CXX} CC=${LOCAL_CC} LDFLAGS=${LOCAL_LDFLAGS} CPPFLAGS=${LOCAL_CPPFLAGS} \
|
||||||
meson setup --wipe builddir/ -Dprefix="${MESA_DIR}/out" -Dglx=xlib -Dosmesa=true -Dgallium-drivers=llvmpipe,swrast -Dvulkan-drivers=swrast
|
meson setup --wipe builddir/ -Dprefix="${MESA_DIR}/out" -Dglx=xlib -Dosmesa=true -Dgallium-drivers=llvmpipe,swrast -Dvulkan-drivers=swrast
|
||||||
CXX=${LOCAL_CXX} CC=${LOCAL_CC} PATH=${LOCAL_PATH} LDFLAGS=${LOCAL_LDFLAGS} CPPFLAGS=${LOCAL_CPPFLAGS} \
|
PKG_CONFIG_PATH=${LOCAL_PKG_CONFIG_PATH} PATH=${LOCAL_PATH} \
|
||||||
|
CXX=${LOCAL_CXX} CC=${LOCAL_CC} LDFLAGS=${LOCAL_LDFLAGS} CPPFLAGS=${LOCAL_CPPFLAGS} \
|
||||||
meson install -C builddir/
|
meson install -C builddir/
|
||||||
|
|
||||||
# Disable python venv
|
# Disable python venv
|
||||||
@@ -145,6 +152,6 @@ deactivate
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
if [[ "$GITHUB_WORKFLOW" ]]; then
|
if [[ "$GITHUB_WORKFLOW" ]]; then
|
||||||
set +e
|
set +x
|
||||||
fi
|
fi
|
||||||
set +x
|
set +e
|
||||||
+7
-6
@@ -204,9 +204,10 @@
|
|||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/brace-expansion": {
|
"node_modules/brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
|
||||||
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
|
||||||
|
"license": "MIT",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
@@ -409,9 +410,9 @@
|
|||||||
"integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A=="
|
"integrity": "sha512-Nik3Sc0ncrMK4UUdXQmAnRtzmNQTAAXmXIopizwZ1W1t8QmfJj+zL4OA2I7XPTPW5z5TDqv4hRo/JzouDJnX3A=="
|
||||||
},
|
},
|
||||||
"brace-expansion": {
|
"brace-expansion": {
|
||||||
"version": "1.1.11",
|
"version": "1.1.12",
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
|
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz",
|
||||||
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
|
"integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==",
|
||||||
"requires": {
|
"requires": {
|
||||||
"balanced-match": "^1.0.0",
|
"balanced-match": "^1.0.0",
|
||||||
"concat-map": "0.0.1"
|
"concat-map": "0.0.1"
|
||||||
|
|||||||
@@ -3,4 +3,5 @@ GITHUB_CMAKE_VERSION=3.19.5
|
|||||||
GITHUB_NINJA_VERSION=1.10.2
|
GITHUB_NINJA_VERSION=1.10.2
|
||||||
GITHUB_MESA_VERSION=24.2.1
|
GITHUB_MESA_VERSION=24.2.1
|
||||||
GITHUB_LLVM_VERSION=16
|
GITHUB_LLVM_VERSION=16
|
||||||
GITHUB_NDK_VERSION=27.0.11718014
|
GITHUB_NDK_VERSION=27.0.11718014
|
||||||
|
GITHUB_EMSDK_VERSION=3.1.60
|
||||||
+1
-25
@@ -1,35 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Usage: the first argument selects the build type:
|
source `dirname $0`/../common/ci-check.sh
|
||||||
# - release, to build release only
|
|
||||||
# - debug, to build debug only
|
|
||||||
# - continuous, to build release and debug
|
|
||||||
# - presubmit, for presubmit builds
|
|
||||||
#
|
|
||||||
# The default is release
|
|
||||||
|
|
||||||
echo "This script is intended to run in a CI environment and may modify your current environment."
|
|
||||||
echo "Please refer to BUILDING.md for more information."
|
|
||||||
|
|
||||||
read -r -p "Do you wish to proceed (y/n)? " choice
|
|
||||||
case "${choice}" in
|
|
||||||
y|Y)
|
|
||||||
echo "Build will proceed..."
|
|
||||||
;;
|
|
||||||
n|N)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
source `dirname $0`/../common/ci-common.sh
|
|
||||||
source `dirname $0`/../common/build-common.sh
|
source `dirname $0`/../common/build-common.sh
|
||||||
|
|
||||||
pushd `dirname $0`/../.. > /dev/null
|
pushd `dirname $0`/../.. > /dev/null
|
||||||
|
|
||||||
# If we're generating an archive for release or continuous builds, then we'll also build for the
|
# If we're generating an archive for release or continuous builds, then we'll also build for the
|
||||||
|
|||||||
+2
-29
@@ -1,38 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Usage: the first argument selects the build type:
|
source `dirname $0`/../common/ci-check.sh
|
||||||
# - release, to build release only
|
|
||||||
# - debug, to build debug only
|
|
||||||
# - continuous, to build release and debug
|
|
||||||
# - presubmit, for presubmit builds
|
|
||||||
#
|
|
||||||
# The default is release
|
|
||||||
|
|
||||||
echo "This script is intended to run in a CI environment and may modify your current environment."
|
|
||||||
echo "Please refer to BUILDING.md for more information."
|
|
||||||
|
|
||||||
read -r -p "Do you wish to proceed (y/n)? " choice
|
|
||||||
case "${choice}" in
|
|
||||||
y|Y)
|
|
||||||
echo "Build will proceed..."
|
|
||||||
;;
|
|
||||||
n|N)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
# build-common.sh will generate the following variables:
|
|
||||||
# $GENERATE_ARCHIVES
|
|
||||||
# $BUILD_DEBUG
|
|
||||||
# $BUILD_RELEASE
|
|
||||||
source `dirname $0`/../common/ci-common.sh
|
|
||||||
source `dirname $0`/../common/build-common.sh
|
source `dirname $0`/../common/build-common.sh
|
||||||
|
|
||||||
pushd `dirname $0`/../.. > /dev/null
|
pushd `dirname $0`/../.. > /dev/null
|
||||||
|
|
||||||
./build.sh -c $RUN_TESTS $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE
|
./build.sh -c $RUN_TESTS $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE
|
||||||
|
|||||||
+2
-25
@@ -1,34 +1,11 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Usage: the first argument selects the build type:
|
source `dirname $0`/../common/ci-check.sh
|
||||||
# - release, to build release only
|
|
||||||
# - debug, to build debug only
|
|
||||||
# - continuous, to build release and debug
|
|
||||||
# - presubmit, for presubmit builds
|
|
||||||
#
|
|
||||||
# The default is release
|
|
||||||
|
|
||||||
echo "This script is intended to run in a CI environment and may modify your current environment."
|
|
||||||
echo "Please refer to BUILDING.md for more information."
|
|
||||||
|
|
||||||
read -r -p "Do you wish to proceed (y/n)? " choice
|
|
||||||
case "${choice}" in
|
|
||||||
y|Y)
|
|
||||||
echo "Build will proceed..."
|
|
||||||
;;
|
|
||||||
n|N)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
source `dirname $0`/../common/ci-common.sh
|
|
||||||
source `dirname $0`/../common/build-common.sh
|
source `dirname $0`/../common/build-common.sh
|
||||||
|
|
||||||
pushd `dirname $0`/../.. > /dev/null
|
pushd `dirname $0`/../.. > /dev/null
|
||||||
|
|
||||||
./build.sh -c $RUN_TESTS $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE
|
./build.sh -c $RUN_TESTS $GENERATE_ARCHIVES $BUILD_DEBUG $BUILD_RELEASE
|
||||||
|
|||||||
+1
-25
@@ -1,34 +1,10 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
# Usage: the first argument selects the build type:
|
source `dirname $0`/../common/ci-check.sh
|
||||||
# - release, to build release only
|
|
||||||
# - debug, to build debug only
|
|
||||||
# - continuous, to build release and debug
|
|
||||||
# - presubmit, for presubmit builds
|
|
||||||
#
|
|
||||||
# The default is release
|
|
||||||
|
|
||||||
echo "This script is intended to run in a CI environment and may modify your current environment."
|
|
||||||
echo "Please refer to BUILDING.md for more information."
|
|
||||||
|
|
||||||
read -r -p "Do you wish to proceed (y/n)? " choice
|
|
||||||
case "${choice}" in
|
|
||||||
y|Y)
|
|
||||||
echo "Build will proceed..."
|
|
||||||
;;
|
|
||||||
n|N)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
exit 0
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
set -e
|
set -e
|
||||||
set -x
|
set -x
|
||||||
|
|
||||||
source `dirname $0`/../common/ci-common.sh
|
|
||||||
source `dirname $0`/ci-common.sh
|
|
||||||
source `dirname $0`/../common/build-common.sh
|
source `dirname $0`/../common/build-common.sh
|
||||||
pushd `dirname $0`/../.. > /dev/null
|
pushd `dirname $0`/../.. > /dev/null
|
||||||
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
#!/bin/bash
|
|
||||||
|
|
||||||
# Install emscripten.
|
|
||||||
curl -L https://github.com/emscripten-core/emsdk/archive/refs/tags/3.1.60.zip > emsdk.zip
|
|
||||||
unzip emsdk.zip ; mv emsdk-* emsdk ; cd emsdk
|
|
||||||
./emsdk install latest
|
|
||||||
./emsdk activate latest
|
|
||||||
source ./emsdk_env.sh
|
|
||||||
|
|
||||||
export EMSDK="$PWD"
|
|
||||||
cd ..
|
|
||||||
@@ -47,7 +47,11 @@ if "%RUNNING_LOCALLY%" == "1" (
|
|||||||
set "PATH=%PATH%;C:\Program Files\7-Zip"
|
set "PATH=%PATH%;C:\Program Files\7-Zip"
|
||||||
)
|
)
|
||||||
|
|
||||||
call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
|
:: Outdated windows-2019 pattern
|
||||||
|
:: call "C:\Program Files (x86)\Microsoft Visual Studio\2019\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
|
|
||||||
|
call "C:\Program Files\Microsoft Visual Studio\2022\%VISUAL_STUDIO_VERSION%\VC\Auxiliary\Build\vcvars64.bat"
|
||||||
|
echo Passed vcvars64.bat
|
||||||
if errorlevel 1 exit /b %errorlevel%
|
if errorlevel 1 exit /b %errorlevel%
|
||||||
|
|
||||||
msbuild /version
|
msbuild /version
|
||||||
@@ -107,7 +111,7 @@ cd out\cmake-%variant%
|
|||||||
if errorlevel 1 exit /b %errorlevel%
|
if errorlevel 1 exit /b %errorlevel%
|
||||||
|
|
||||||
cmake ..\.. ^
|
cmake ..\.. ^
|
||||||
-G "Visual Studio 16 2019" ^
|
-G "Visual Studio 17 2022" ^
|
||||||
-A x64 ^
|
-A x64 ^
|
||||||
%flag% ^
|
%flag% ^
|
||||||
-DCMAKE_INSTALL_PREFIX=..\%variant% ^
|
-DCMAKE_INSTALL_PREFIX=..\%variant% ^
|
||||||
|
|||||||
@@ -1027,8 +1027,11 @@ samplerCubemap | Cubemap texture
|
|||||||
[Table [materialParamsTypes]: Material parameter types]
|
[Table [materialParamsTypes]: Material parameter types]
|
||||||
|
|
||||||
Samplers
|
Samplers
|
||||||
: Sampler types can also specify a `format` which can be either `int` or `float` (defaults to
|
: Sampler types can have the following fields:
|
||||||
`float`).
|
- `format` : which can be either `int` or `float` (defaults to `float`).
|
||||||
|
- `multisample` : a boolean to indicate whether the sampler is meant for multisampling (defaults to `false`)
|
||||||
|
- `unfilterable` : a boolean to indicate whether the sampling is not filtered (defaults to `false`)
|
||||||
|
|
||||||
|
|
||||||
Arrays
|
Arrays
|
||||||
: A parameter can define an array of values by appending `[size]` after the type name, where
|
: A parameter can define an array of values by appending `[size]` after the type name, where
|
||||||
|
|||||||
@@ -30,11 +30,6 @@ from utils import execute, ArgParseImpl
|
|||||||
CUR_DIR = os.path.dirname(os.path.abspath(__file__))
|
CUR_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||||
ROOT_DIR = os.path.join(CUR_DIR, '../../')
|
ROOT_DIR = os.path.join(CUR_DIR, '../../')
|
||||||
|
|
||||||
def get_last_commit_hash():
|
|
||||||
res, ret = execute('git rev-parse HEAD', cwd=ROOT_DIR)
|
|
||||||
assert res == 0, 'Failed to get the last commit hash'
|
|
||||||
return ret.strip()
|
|
||||||
|
|
||||||
def get_edited_files(commit_hash):
|
def get_edited_files(commit_hash):
|
||||||
INSERT = '#####?????'
|
INSERT = '#####?????'
|
||||||
res, ret = execute(f'git show --name-only --pretty=%b{INSERT} {commit_hash}')
|
res, ret = execute(f'git show --name-only --pretty=%b{INSERT} {commit_hash}')
|
||||||
|
|||||||
@@ -39,13 +39,13 @@ function download_mdbook() {
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
local CHECK_UNAME="
|
local CHECK_UNAME="
|
||||||
import sys;
|
import sys
|
||||||
parts=[a.lower() for a in sys.stdin.read().strip().split(' ')];
|
parts=[a.lower() for a in sys.stdin.read().strip().split(' ')]
|
||||||
def get_type():
|
def get_type():
|
||||||
if 'darwin' in parts:
|
if 'darwin' in parts:
|
||||||
if 'x86_64' in parts:
|
if 'x86_64' in parts:
|
||||||
return ${DARWIN_X86}
|
return ${DARWIN_X86}
|
||||||
elif 'aarch' in parts:
|
elif 'aarch' in parts or 'arm64' in parts:
|
||||||
return ${DARWIN_ARM}
|
return ${DARWIN_ARM}
|
||||||
elif 'linux' in parts:
|
elif 'linux' in parts:
|
||||||
if 'x86_64' in parts:
|
if 'x86_64' in parts:
|
||||||
@@ -63,11 +63,12 @@ print(get_type())
|
|||||||
echo "*** Need to install Rust ***"
|
echo "*** Need to install Rust ***"
|
||||||
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
|
curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh
|
||||||
fi
|
fi
|
||||||
|
source "${HOME}/.cargo/env"
|
||||||
if ! (command -v cargo >/dev/null 2>&1); then
|
if ! (command -v cargo >/dev/null 2>&1); then
|
||||||
echo "*** Still cannot find `cargo` ***"
|
echo "*** Still cannot find cargo ***"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
cargo install mdbook
|
cargo install --force mdbook
|
||||||
else
|
else
|
||||||
# Download prebuilts from github
|
# Download prebuilts from github
|
||||||
mkdir -p ${HOME}/.cargo/bin
|
mkdir -p ${HOME}/.cargo/bin
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ This document is part of the [Filament project](https://github.com/google/filame
|
|||||||
## Authors
|
## Authors
|
||||||
|
|
||||||
- [Romain Guy](https://github.com/romainguy), [@romainguy](https://twitter.com/romainguy)
|
- [Romain Guy](https://github.com/romainguy), [@romainguy](https://twitter.com/romainguy)
|
||||||
- [Mathias Agopian](https://github.com/pixelflinger), [@darthmoosious](https://twitter.com/darthmoosious)
|
- [Mathias Agopian](https://github.com/pixelflinger), [@pixelflinger](https://bsky.app/profile/pixelflinger.bsky.social)
|
||||||
|
|
||||||
# Overview
|
# Overview
|
||||||
|
|
||||||
@@ -78,26 +78,27 @@ in table [standardProperties].
|
|||||||
Property | Definition
|
Property | Definition
|
||||||
-----------------------:|:---------------------
|
-----------------------:|:---------------------
|
||||||
**baseColor** | Diffuse albedo for non-metallic surfaces, and specular color for metallic surfaces
|
**baseColor** | Diffuse albedo for non-metallic surfaces, and specular color for metallic surfaces
|
||||||
**metallic** | Whether a surface appears to be dielectric (0.0) or conductor (1.0). Often used as a binary value (0 or 1)
|
|
||||||
**roughness** | Perceived smoothness (1.0) or roughness (0.0) of a surface. Smooth surfaces exhibit sharp reflections
|
**roughness** | Perceived smoothness (1.0) or roughness (0.0) of a surface. Smooth surfaces exhibit sharp reflections
|
||||||
|
**metallic** | Whether a surface appears to be dielectric (0.0) or conductor (1.0). Often used as a binary value (0 or 1)
|
||||||
**reflectance** | Fresnel reflectance at normal incidence for dielectric surfaces. This directly controls the strength of the reflections
|
**reflectance** | Fresnel reflectance at normal incidence for dielectric surfaces. This directly controls the strength of the reflections
|
||||||
**sheenColor** | Strength of the sheen layer
|
**ambientOcclusion** | Defines how much of the ambient light is accessible to a surface point. It is a per-pixel shadowing factor between 0.0 and 1.0
|
||||||
**sheenRoughness** | Perceived smoothness or roughness of the sheen layer
|
|
||||||
**clearCoat** | Strength of the clear coat layer
|
**clearCoat** | Strength of the clear coat layer
|
||||||
**clearCoatRoughness** | Perceived smoothness or roughness of the clear coat layer
|
**clearCoatRoughness** | Perceived smoothness or roughness of the clear coat layer
|
||||||
|
**clearCoatNormal** | A detail normal used to perturb the clear coat layer using _bump mapping_ (_normal mapping_)
|
||||||
**anisotropy** | Amount of anisotropy in either the tangent or bitangent direction
|
**anisotropy** | Amount of anisotropy in either the tangent or bitangent direction
|
||||||
**anisotropyDirection** | Local surface direction in tangent space
|
**anisotropyDirection** | Local surface direction in tangent space
|
||||||
**ambientOcclusion** | Defines how much of the ambient light is accessible to a surface point. It is a per-pixel shadowing factor between 0.0 and 1.0
|
|
||||||
**normal** | A detail normal used to perturb the surface using _bump mapping_ (_normal mapping_)
|
|
||||||
**bentNormal** | A normal pointing in the average unoccluded direction. Can be used to improve indirect lighting quality
|
|
||||||
**clearCoatNormal** | A detail normal used to perturb the clear coat layer using _bump mapping_ (_normal mapping_)
|
|
||||||
**emissive** | Additional diffuse albedo to simulate emissive surfaces (such as neons, etc.) This property is mostly useful in an HDR pipeline with a bloom pass
|
|
||||||
**postLightingColor** | Additional color that can be blended with the result of the lighting computations. See `postLightingBlending`
|
|
||||||
**ior** | Index of refraction, either for refractive objects or as an alternative to reflectance
|
|
||||||
**transmission** | Defines how much of the diffuse light of a dielectric is transmitted through the object, in other words this defines how transparent an object is
|
|
||||||
**absorption** | Absorption factor for refractive objects
|
|
||||||
**microThickness** | Thickness of the thin layer of refractive objects
|
|
||||||
**thickness** | Thickness of the solid volume of refractive objects
|
**thickness** | Thickness of the solid volume of refractive objects
|
||||||
|
**sheenColor** | Strength of the sheen layer
|
||||||
|
**sheenRoughness** | Perceived smoothness or roughness of the sheen layer
|
||||||
|
**emissive** | Additional diffuse albedo to simulate emissive surfaces (such as neons, etc.) This property is mostly useful in an HDR pipeline with a bloom pass
|
||||||
|
**normal** | A detail normal used to perturb the surface using _bump mapping_ (_normal mapping_)
|
||||||
|
**postLightingColor** | Additional color that can be blended with the result of the lighting computations. See `postLightingBlending`
|
||||||
|
**absorption** | Absorption factor for refractive objects
|
||||||
|
**transmission** | Defines how much of the diffuse light of a dielectric is transmitted through the object, in other words this defines how transparent an object is
|
||||||
|
**ior** | Index of refraction, either for refractive objects or as an alternative to reflectance
|
||||||
|
**microThickness** | Thickness of the thin layer of refractive objects
|
||||||
|
**bentNormal** | A normal pointing in the average unoccluded direction. Can be used to improve indirect lighting quality
|
||||||
|
**shadowStrength** | Strength factor between 0 and 1 for all shadows received by this material
|
||||||
[Table [standardProperties]: Properties of the standard model]
|
[Table [standardProperties]: Properties of the standard model]
|
||||||
|
|
||||||
The type and range of each property is described in table [standardPropertiesTypes].
|
The type and range of each property is described in table [standardPropertiesTypes].
|
||||||
@@ -991,10 +992,13 @@ Type
|
|||||||
|
|
||||||
Value
|
Value
|
||||||
: Each entry is an object with the properties `name` and `type`, both of `string` type. The
|
: Each entry is an object with the properties `name` and `type`, both of `string` type. The
|
||||||
name must be a valid GLSL identifier. Entries also have an optional `precision`, which can be
|
name must be a valid GLSL identifier. Entries have an optional `precision`, which can be
|
||||||
one of `default` (best precision for the platform, typically `high` on desktop, `medium` on
|
one of `default` (best precision for the platform, typically `high` on desktop, `medium` on
|
||||||
mobile), `low`, `medium`, `high`. The type must be one of the types described in
|
mobile), `low`, `medium`, `high`. The type must be one of the types described in
|
||||||
table [materialParamsTypes].
|
table [materialParamsTypes]. For Android external textures, entries also have an optional
|
||||||
|
transformName parameter to specify the name of the material parameter that will be
|
||||||
|
used to expose the transform matrix associated with the external sampler. In iOS and Vulkan,
|
||||||
|
this will always be identity.
|
||||||
|
|
||||||
Type | Description
|
Type | Description
|
||||||
:----------------------|:---------------------------------
|
:----------------------|:---------------------------------
|
||||||
@@ -1269,6 +1273,9 @@ Description
|
|||||||
when selecting any shading model that is not `unlit`. See the shader sections of this document
|
when selecting any shading model that is not `unlit`. See the shader sections of this document
|
||||||
for more information on how to access these attributes from the shaders.
|
for more information on how to access these attributes from the shaders.
|
||||||
|
|
||||||
|
!!! Note: Interaction with custom variables
|
||||||
|
When the `color` attribute is specified, only four custom variables are available instead of five.
|
||||||
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
|
||||||
material {
|
material {
|
||||||
parameters : [
|
parameters : [
|
||||||
@@ -1299,7 +1306,7 @@ Type
|
|||||||
: array of `string`
|
: array of `string`
|
||||||
|
|
||||||
Value
|
Value
|
||||||
: Up to 4 strings, each must be a valid GLSL identifier.
|
: Up to 5 strings, each must be a valid GLSL identifier.
|
||||||
|
|
||||||
Description
|
Description
|
||||||
: Defines custom interpolants (or variables) that are output by the material's vertex shader.
|
: Defines custom interpolants (or variables) that are output by the material's vertex shader.
|
||||||
@@ -1315,6 +1322,10 @@ Description
|
|||||||
particular if `default` is specified the default precision is used is the fragment shader
|
particular if `default` is specified the default precision is used is the fragment shader
|
||||||
(`mediump`) and in the vertex shader (`highp`).
|
(`mediump`) and in the vertex shader (`highp`).
|
||||||
|
|
||||||
|
!!! Warning: Interaction with required attributes
|
||||||
|
If the `color` attribute is specified in the `required` list, then only four variables can be used
|
||||||
|
instead of five.
|
||||||
|
|
||||||
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
|
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ JSON
|
||||||
material {
|
material {
|
||||||
name : Skybox,
|
name : Skybox,
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
- [Metal](./notes/metal_debugging.md)
|
- [Metal](./notes/metal_debugging.md)
|
||||||
- [Vulkan](./notes/vulkan_debugging.md)
|
- [Vulkan](./notes/vulkan_debugging.md)
|
||||||
- [SPIR-V](./notes/spirv_debugging.md)
|
- [SPIR-V](./notes/spirv_debugging.md)
|
||||||
|
- [Running with ASAN and UBSAN](./notes/asan_ubsan.md)
|
||||||
|
- [Using Instruments on macOS](./notes/instruments.md)
|
||||||
- [Libraries](./notes/libs.md)
|
- [Libraries](./notes/libs.md)
|
||||||
- [bluegl](./dup/bluegl.md)
|
- [bluegl](./dup/bluegl.md)
|
||||||
- [bluevk](./dup/bluevk.md)
|
- [bluevk](./dup/bluevk.md)
|
||||||
|
|||||||
@@ -146,7 +146,7 @@ This document is part of the <a href="https://github.com/google/filament">Filame
|
|||||||
<ul>
|
<ul>
|
||||||
<li class="minus"><a href="https://github.com/romainguy">Romain Guy</a>, <a href="https://twitter.com/romainguy">@romainguy</a>
|
<li class="minus"><a href="https://github.com/romainguy">Romain Guy</a>, <a href="https://twitter.com/romainguy">@romainguy</a>
|
||||||
</li>
|
</li>
|
||||||
<li class="minus"><a href="https://github.com/pixelflinger">Mathias Agopian</a>, <a href="https://twitter.com/darthmoosious">@darthmoosious</a></li></ul>
|
<li class="minus"><a href="https://github.com/pixelflinger">Mathias Agopian</a>, <a href="https://bsky.app/profile/pixelflinger.bsky.social">@pixelflinger</a></li></ul>
|
||||||
</p>
|
</p>
|
||||||
<a class="target" name="overview"> </a><a class="target" name="overview"> </a><a class="target" name="toc2"> </a><h1>Overview</h1>
|
<a class="target" name="overview"> </a><a class="target" name="overview"> </a><a class="target" name="toc2"> </a><h1>Overview</h1>
|
||||||
<p>
|
<p>
|
||||||
@@ -217,26 +217,27 @@ in <a href="#table_standardproperties" target="_self">table 1</a>.
|
|||||||
<div class='table'>
|
<div class='table'>
|
||||||
<a class="target" name="table_standardproperties"> </a><table class="table longtable"><tr><th style="text-align:right"> Property </th><th style="text-align:left"> Definition </th></tr>
|
<a class="target" name="table_standardproperties"> </a><table class="table longtable"><tr><th style="text-align:right"> Property </th><th style="text-align:left"> Definition </th></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">baseColor</strong> </td><td style="text-align:left"> Diffuse albedo for non-metallic surfaces, and specular color for metallic surfaces </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">baseColor</strong> </td><td style="text-align:left"> Diffuse albedo for non-metallic surfaces, and specular color for metallic surfaces </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">metallic</strong> </td><td style="text-align:left"> Whether a surface appears to be dielectric (0.0) or conductor (1.0). Often used as a binary value (0 or 1) </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">roughness</strong> </td><td style="text-align:left"> Perceived smoothness (1.0) or roughness (0.0) of a surface. Smooth surfaces exhibit sharp reflections </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">roughness</strong> </td><td style="text-align:left"> Perceived smoothness (1.0) or roughness (0.0) of a surface. Smooth surfaces exhibit sharp reflections </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">metallic</strong> </td><td style="text-align:left"> Whether a surface appears to be dielectric (0.0) or conductor (1.0). Often used as a binary value (0 or 1) </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">reflectance</strong> </td><td style="text-align:left"> Fresnel reflectance at normal incidence for dielectric surfaces. This directly controls the strength of the reflections </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">reflectance</strong> </td><td style="text-align:left"> Fresnel reflectance at normal incidence for dielectric surfaces. This directly controls the strength of the reflections </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">sheenColor</strong> </td><td style="text-align:left"> Strength of the sheen layer </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">ambientOcclusion</strong> </td><td style="text-align:left"> Defines how much of the ambient light is accessible to a surface point. It is a per-pixel shadowing factor between 0.0 and 1.0 </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">sheenRoughness</strong> </td><td style="text-align:left"> Perceived smoothness or roughness of the sheen layer </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">clearCoat</strong> </td><td style="text-align:left"> Strength of the clear coat layer </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">clearCoat</strong> </td><td style="text-align:left"> Strength of the clear coat layer </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">clearCoatRoughness</strong> </td><td style="text-align:left"> Perceived smoothness or roughness of the clear coat layer </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">clearCoatRoughness</strong> </td><td style="text-align:left"> Perceived smoothness or roughness of the clear coat layer </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">clearCoatNormal</strong> </td><td style="text-align:left"> A detail normal used to perturb the clear coat layer using <em class="underscore">bump mapping</em> (<em class="underscore">normal mapping</em>) </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">anisotropy</strong> </td><td style="text-align:left"> Amount of anisotropy in either the tangent or bitangent direction </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">anisotropy</strong> </td><td style="text-align:left"> Amount of anisotropy in either the tangent or bitangent direction </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">anisotropyDirection</strong> </td><td style="text-align:left"> Local surface direction in tangent space </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">anisotropyDirection</strong> </td><td style="text-align:left"> Local surface direction in tangent space </td></tr>
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">ambientOcclusion</strong> </td><td style="text-align:left"> Defines how much of the ambient light is accessible to a surface point. It is a per-pixel shadowing factor between 0.0 and 1.0 </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">normal</strong> </td><td style="text-align:left"> A detail normal used to perturb the surface using <em class="underscore">bump mapping</em> (<em class="underscore">normal mapping</em>) </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">bentNormal</strong> </td><td style="text-align:left"> A normal pointing in the average unoccluded direction. Can be used to improve indirect lighting quality </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">clearCoatNormal</strong> </td><td style="text-align:left"> A detail normal used to perturb the clear coat layer using <em class="underscore">bump mapping</em> (<em class="underscore">normal mapping</em>) </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">emissive</strong> </td><td style="text-align:left"> Additional diffuse albedo to simulate emissive surfaces (such as neons, etc.) This property is mostly useful in an HDR pipeline with a bloom pass </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">postLightingColor</strong> </td><td style="text-align:left"> Additional color that can be blended with the result of the lighting computations. See <code>postLightingBlending</code> </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">ior</strong> </td><td style="text-align:left"> Index of refraction, either for refractive objects or as an alternative to reflectance </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">transmission</strong> </td><td style="text-align:left"> Defines how much of the diffuse light of a dielectric is transmitted through the object, in other words this defines how transparent an object is </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">absorption</strong> </td><td style="text-align:left"> Absorption factor for refractive objects </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">microThickness</strong> </td><td style="text-align:left"> Thickness of the thin layer of refractive objects </td></tr>
|
|
||||||
<tr><td style="text-align:right"> <strong class="asterisk">thickness</strong> </td><td style="text-align:left"> Thickness of the solid volume of refractive objects </td></tr>
|
<tr><td style="text-align:right"> <strong class="asterisk">thickness</strong> </td><td style="text-align:left"> Thickness of the solid volume of refractive objects </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">sheenColor</strong> </td><td style="text-align:left"> Strength of the sheen layer </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">sheenRoughness</strong> </td><td style="text-align:left"> Perceived smoothness or roughness of the sheen layer </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">emissive</strong> </td><td style="text-align:left"> Additional diffuse albedo to simulate emissive surfaces (such as neons, etc.) This property is mostly useful in an HDR pipeline with a bloom pass </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">normal</strong> </td><td style="text-align:left"> A detail normal used to perturb the surface using <em class="underscore">bump mapping</em> (<em class="underscore">normal mapping</em>) </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">postLightingColor</strong> </td><td style="text-align:left"> Additional color that can be blended with the result of the lighting computations. See <code>postLightingBlending</code> </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">absorption</strong> </td><td style="text-align:left"> Absorption factor for refractive objects </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">transmission</strong> </td><td style="text-align:left"> Defines how much of the diffuse light of a dielectric is transmitted through the object, in other words this defines how transparent an object is </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">ior</strong> </td><td style="text-align:left"> Index of refraction, either for refractive objects or as an alternative to reflectance </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">microThickness</strong> </td><td style="text-align:left"> Thickness of the thin layer of refractive objects </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">bentNormal</strong> </td><td style="text-align:left"> A normal pointing in the average unoccluded direction. Can be used to improve indirect lighting quality </td></tr>
|
||||||
|
<tr><td style="text-align:right"> <strong class="asterisk">shadowStrength</strong> </td><td style="text-align:left"> Strength factor between 0 and 1 for all shadows received by this material </td></tr>
|
||||||
</table><center><div class="tablecaption"><b style="font-style:normal;">Table 1:</b> Properties of the standard model</div></center></div>
|
</table><center><div class="tablecaption"><b style="font-style:normal;">Table 1:</b> Properties of the standard model</div></center></div>
|
||||||
</p><p>
|
</p><p>
|
||||||
The type and range of each property is described in <a href="#table_standardpropertiestypes" target="_self">table 2</a>.
|
The type and range of each property is described in <a href="#table_standardpropertiestypes" target="_self">table 2</a>.
|
||||||
@@ -1097,10 +1098,13 @@ non-shader data.
|
|||||||
|
|
||||||
<dl><dt>Type</dt><dd><p> array of parameter objects
|
<dl><dt>Type</dt><dd><p> array of parameter objects
|
||||||
</p></dd><dt>Value</dt><dd><p> Each entry is an object with the properties <code>name</code> and <code>type</code>, both of <code>string</code> type. The
|
</p></dd><dt>Value</dt><dd><p> Each entry is an object with the properties <code>name</code> and <code>type</code>, both of <code>string</code> type. The
|
||||||
name must be a valid GLSL identifier. Entries also have an optional <code>precision</code>, which can be
|
name must be a valid GLSL identifier. Entries have an optional <code>precision</code>, which can be
|
||||||
one of <code>default</code> (best precision for the platform, typically <code>high</code> on desktop, <code>medium</code> on
|
one of <code>default</code> (best precision for the platform, typically <code>high</code> on desktop, <code>medium</code> on
|
||||||
mobile), <code>low</code>, <code>medium</code>, <code>high</code>. The type must be one of the types described in
|
mobile), <code>low</code>, <code>medium</code>, <code>high</code>. The type must be one of the types described in
|
||||||
<a href="#table_materialparamstypes" target="_self">table 14</a>.
|
<a href="#table_materialparamstypes" target="_self">table 14</a>. For Android external textures, entries also have an optional
|
||||||
|
transformName parameter to specify the name of the material parameter that will be
|
||||||
|
used to expose the transform matrix associated with the external sampler. In iOS and Vulkan,
|
||||||
|
this will always be identity.
|
||||||
</p></dd></dl><div class='table'>
|
</p></dd></dl><div class='table'>
|
||||||
<a class="target" name="table_materialparamstypes"> </a><table class="table longtable"><tr><th style="text-align:left"> Type </th><th style="text-align:left"> Description </th></tr>
|
<a class="target" name="table_materialparamstypes"> </a><table class="table longtable"><tr><th style="text-align:left"> Type </th><th style="text-align:left"> Description </th></tr>
|
||||||
<tr><td style="text-align:left"> bool </td><td style="text-align:left"> Single boolean </td></tr>
|
<tr><td style="text-align:left"> bool </td><td style="text-align:left"> Single boolean </td></tr>
|
||||||
@@ -1322,7 +1326,10 @@ non-shader data.
|
|||||||
required and does not need to be specified. The <code>tangents</code> attribute is automatically required
|
required and does not need to be specified. The <code>tangents</code> attribute is automatically required
|
||||||
when selecting any shading model that is not <code>unlit</code>. See the shader sections of this document
|
when selecting any shading model that is not <code>unlit</code>. See the shader sections of this document
|
||||||
for more information on how to access these attributes from the shaders.
|
for more information on how to access these attributes from the shaders.
|
||||||
</p></dd></dl></p><pre class="listing tilde"><code><span class="line"></span>material <span class="hljs-punctuation">{</span>
|
</p></dd></dl><div class="admonition note"><div class="admonition-title"> Interaction with custom variables</div>
|
||||||
|
</p><p>
|
||||||
|
When the <code>color</code> attribute is specified, only four custom variables are available instead of five.</div>
|
||||||
|
</p><pre class="listing tilde"><code><span class="line"></span>material <span class="hljs-punctuation">{</span>
|
||||||
<span class="line"></span> parameters <span class="hljs-punctuation">:</span> <span class="hljs-punctuation">[</span>
|
<span class="line"></span> parameters <span class="hljs-punctuation">:</span> <span class="hljs-punctuation">[</span>
|
||||||
<span class="line"></span> <span class="hljs-punctuation">{</span>
|
<span class="line"></span> <span class="hljs-punctuation">{</span>
|
||||||
<span class="line"></span> type <span class="hljs-punctuation">:</span> sampler2d<span class="hljs-punctuation">,</span>
|
<span class="line"></span> type <span class="hljs-punctuation">:</span> sampler2d<span class="hljs-punctuation">,</span>
|
||||||
@@ -1347,7 +1354,7 @@ non-shader data.
|
|||||||
<p>
|
<p>
|
||||||
|
|
||||||
<dl><dt>Type</dt><dd><p> array of <code>string</code>
|
<dl><dt>Type</dt><dd><p> array of <code>string</code>
|
||||||
</p></dd><dt>Value</dt><dd><p> Up to 4 strings, each must be a valid GLSL identifier.
|
</p></dd><dt>Value</dt><dd><p> Up to 5 strings, each must be a valid GLSL identifier.
|
||||||
</p></dd><dt>Description</dt><dd><p> Defines custom interpolants (or variables) that are output by the material's vertex shader.
|
</p></dd><dt>Description</dt><dd><p> Defines custom interpolants (or variables) that are output by the material's vertex shader.
|
||||||
Each entry of the array defines the name of an interpolant. The full name in the fragment
|
Each entry of the array defines the name of an interpolant. The full name in the fragment
|
||||||
shader is the name of the interpolant with the <code>variable_</code> prefix. For instance, if you
|
shader is the name of the interpolant with the <code>variable_</code> prefix. For instance, if you
|
||||||
@@ -1360,7 +1367,11 @@ non-shader data.
|
|||||||
In this case the specified precision is used as-is in both fragment and vertex stages, in
|
In this case the specified precision is used as-is in both fragment and vertex stages, in
|
||||||
particular if <code>default</code> is specified the default precision is used is the fragment shader
|
particular if <code>default</code> is specified the default precision is used is the fragment shader
|
||||||
(<code>mediump</code>) and in the vertex shader (<code>highp</code>).
|
(<code>mediump</code>) and in the vertex shader (<code>highp</code>).
|
||||||
</p></dd></dl></p><pre class="listing tilde"><code><span class="line"></span>material <span class="hljs-punctuation">{</span>
|
</p></dd></dl><div class="admonition warning"><div class="admonition-title"> Interaction with required attributes</div>
|
||||||
|
</p><p>
|
||||||
|
If the <code>color</code> attribute is specified in the <code>required</code> list, then only four variables can be used
|
||||||
|
instead of five.</div>
|
||||||
|
</p><pre class="listing tilde"><code><span class="line"></span>material <span class="hljs-punctuation">{</span>
|
||||||
<span class="line"></span> name <span class="hljs-punctuation">:</span> Skybox<span class="hljs-punctuation">,</span>
|
<span class="line"></span> name <span class="hljs-punctuation">:</span> Skybox<span class="hljs-punctuation">,</span>
|
||||||
<span class="line"></span> parameters <span class="hljs-punctuation">:</span> <span class="hljs-punctuation">[</span>
|
<span class="line"></span> parameters <span class="hljs-punctuation">:</span> <span class="hljs-punctuation">[</span>
|
||||||
<span class="line"></span> <span class="hljs-punctuation">{</span>
|
<span class="line"></span> <span class="hljs-punctuation">{</span>
|
||||||
|
|||||||
@@ -0,0 +1,41 @@
|
|||||||
|
# Running with ASAN/UBSAN
|
||||||
|
|
||||||
|
## Enabling
|
||||||
|
|
||||||
|
When building though build.sh, pass the `-b` flag. This sets the cmake variable
|
||||||
|
`FILAMENT_ENABLE_ASAN_UBSAN=ON` which eventually passes `"-fsanitize=address -fsanitize=undefined"`
|
||||||
|
to all compile and link operations.
|
||||||
|
|
||||||
|
If building through CMake directly, or an IDE like CLion that doesn't use build.sh, instead pass
|
||||||
|
`-DFILAMENT_ENABLE_ASAN_UBSAN=ON` to cmake in order to get the same result.
|
||||||
|
|
||||||
|
## Getting memory leak detection on Mac
|
||||||
|
|
||||||
|
Memory leak detection isn't enabled by default on MacOS. There are two issues to address, first is
|
||||||
|
using a version of clang that supports memory leak detection and second is enabling it at runtime.
|
||||||
|
|
||||||
|
The version of clang distributed by Apple (with a version like "Apple clang version 16.0.0") doesn't
|
||||||
|
currently support leak detection at all. Instead you will need to get or build a different LLVM,
|
||||||
|
such as the one distributed through homebrew and get CMake to use that instead.
|
||||||
|
|
||||||
|
Then during runtime you'll need to have the environment variable `ASAN_OPTIONS` include the option
|
||||||
|
`detect_leaks=1`. Multiple `ASAN_OPTIONS` values are concatenated with `:`.
|
||||||
|
|
||||||
|
## Getting memory leak output in CLion
|
||||||
|
|
||||||
|
### Setting variables
|
||||||
|
|
||||||
|
Under `Settings | Build, Execution, Deployment | Dynamic Analysis Tools | Sanitizers` there is an
|
||||||
|
ASAN Settings field that overrides whatever other `ASAN_OPTIONS` you might set elsewhere, so you
|
||||||
|
must use that instead of setting it through your Run/Debug Configuration.
|
||||||
|
|
||||||
|
To pass `-DFILAMENT_ENABLE_ASAN_UBSAN=ON` to CMake you'll want to create a new CMake Profile and
|
||||||
|
pass it as a CMake argument.
|
||||||
|
|
||||||
|
### Avoiding losing output
|
||||||
|
|
||||||
|
CMake will consume ASAN output and display it through a separate "Sanitizers" tab. Unfortunately
|
||||||
|
certain leak detection errors that interrupt the executable seem to not show up in this tab, but are
|
||||||
|
still removed from the user-visible console output. If this is happening and you need to see the
|
||||||
|
unfiltered console output you'll need to go to `Settings | Build, Execution, Deployment | Dynamic
|
||||||
|
Analysis Tools | Sanitizers` and uncheck "Use visual representation for Sanitizer's output".
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# Using Instruments on macOS
|
||||||
|
|
||||||
|
When running a binary under Instruments on macOS, you may run into the following issue when
|
||||||
|
launching or attaching to an executable:
|
||||||
|
|
||||||
|
```
|
||||||
|
Failed to gain authorization
|
||||||
|
Recovery Suggestion: Target binary needs to be debuggable and signed with 'get-task-allow'
|
||||||
|
```
|
||||||
|
|
||||||
|
This is a security precaution; the solution is to code sign the binary with the
|
||||||
|
`com.apple.security.get-task-allow` entitlement.
|
||||||
|
|
||||||
|
1. Create an `entitlements.plist` file with the following contents:
|
||||||
|
|
||||||
|
```
|
||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>com.apple.security.get-task-allow</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
|
```
|
||||||
|
|
||||||
|
2. Run the following command:
|
||||||
|
|
||||||
|
```
|
||||||
|
codesign -s - --entitlements entitlements.plist <binary>
|
||||||
|
```
|
||||||
|
|
||||||
|
Replace `<binary>` with the name of the binary, for example: `out/cmake-debug/samples/gltf_viewer`.
|
||||||
|
|
||||||
|
Afterwards, you should be able to successfully launch and attach to the executable using
|
||||||
|
Instruments.
|
||||||
+39
-2
@@ -265,6 +265,13 @@ set(MATERIAL_SRCS
|
|||||||
src/materials/vsmMipmap.mat
|
src/materials/vsmMipmap.mat
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (NOT FILAMENT_DISABLE_GTAO)
|
||||||
|
list(APPEND MATERIAL_SRCS
|
||||||
|
src/materials/ssao/gtao.mat
|
||||||
|
src/materials/ssao/gtaoBentNormals.mat
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
set(MATERIAL_FL0_SRCS
|
set(MATERIAL_FL0_SRCS
|
||||||
src/materials/defaultMaterial.mat
|
src/materials/defaultMaterial.mat
|
||||||
src/materials/skybox.mat
|
src/materials/skybox.mat
|
||||||
@@ -314,12 +321,14 @@ if (FILAMENT_FORCE_PROFILING_MODE)
|
|||||||
add_definitions(-DFILAMENT_FORCE_PROFILING_MODE)
|
add_definitions(-DFILAMENT_FORCE_PROFILING_MODE)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
|
if (FILAMENT_DISABLE_GTAO)
|
||||||
|
add_definitions(-DFILAMENT_DISABLE_GTAO)
|
||||||
|
endif()
|
||||||
|
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
# Definitions
|
# Definitions
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
|
|
||||||
# "2" corresponds to SYSTRACE_TAG_FILEMENT (See: utils/Systrace.h)
|
|
||||||
add_definitions(-DSYSTRACE_TAG=2)
|
|
||||||
add_definitions(-DFILAMENT_DFG_LUT_SIZE=${DFG_LUT_SIZE})
|
add_definitions(-DFILAMENT_DFG_LUT_SIZE=${DFG_LUT_SIZE})
|
||||||
add_definitions(
|
add_definitions(
|
||||||
-DFILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB=${FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB}
|
-DFILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB=${FILAMENT_PER_RENDER_PASS_ARENA_SIZE_IN_MB}
|
||||||
@@ -463,6 +472,30 @@ add_custom_command(
|
|||||||
APPEND
|
APPEND
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (NOT FILAMENT_DISABLE_GTAO)
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT "${MATERIAL_DIR}/gtao.filamat"
|
||||||
|
DEPENDS src/materials/ssao/ssaoUtils.fs
|
||||||
|
DEPENDS src/materials/ssao/ssct.fs
|
||||||
|
DEPENDS src/materials/utils/depthUtils.fs
|
||||||
|
DEPENDS src/materials/utils/geometry.fs
|
||||||
|
DEPENDS src/materials/ssao/gtaoImpl.fs
|
||||||
|
DEPENDS src/materials/ssao/ssctImpl.fs
|
||||||
|
APPEND
|
||||||
|
)
|
||||||
|
|
||||||
|
add_custom_command(
|
||||||
|
OUTPUT "${MATERIAL_DIR}/gtaoBentNormals.filamat"
|
||||||
|
DEPENDS src/materials/ssao/ssaoUtils.fs
|
||||||
|
DEPENDS src/materials/ssao/ssct.fs
|
||||||
|
DEPENDS src/materials/utils/depthUtils.fs
|
||||||
|
DEPENDS src/materials/utils/geometry.fs
|
||||||
|
DEPENDS src/materials/ssao/gtaoImpl.fs
|
||||||
|
DEPENDS src/materials/ssao/ssctImpl.fs
|
||||||
|
APPEND
|
||||||
|
)
|
||||||
|
endif()
|
||||||
|
|
||||||
add_custom_command(
|
add_custom_command(
|
||||||
OUTPUT "${MATERIAL_DIR}/bilateralBlur.filamat"
|
OUTPUT "${MATERIAL_DIR}/bilateralBlur.filamat"
|
||||||
DEPENDS src/materials/ssao/ssaoUtils.fs
|
DEPENDS src/materials/ssao/ssaoUtils.fs
|
||||||
@@ -568,6 +601,10 @@ target_link_libraries(${TARGET} PUBLIC filaflat)
|
|||||||
target_link_libraries(${TARGET} PUBLIC filabridge)
|
target_link_libraries(${TARGET} PUBLIC filabridge)
|
||||||
target_link_libraries(${TARGET} PUBLIC ibl-lite)
|
target_link_libraries(${TARGET} PUBLIC ibl-lite)
|
||||||
|
|
||||||
|
if (FILAMENT_USE_ABSEIL_LOGGING)
|
||||||
|
target_link_libraries(${TARGET} PUBLIC absl::log)
|
||||||
|
endif()
|
||||||
|
|
||||||
if (FILAMENT_ENABLE_FGVIEWER)
|
if (FILAMENT_ENABLE_FGVIEWER)
|
||||||
target_link_libraries(${TARGET} PUBLIC fgviewer)
|
target_link_libraries(${TARGET} PUBLIC fgviewer)
|
||||||
add_definitions(-DFILAMENT_ENABLE_FGVIEWER=1)
|
add_definitions(-DFILAMENT_ENABLE_FGVIEWER=1)
|
||||||
|
|||||||
+5
-4
@@ -92,7 +92,7 @@ Copy your platform's Makefile below into a `Makefile` inside the same directory.
|
|||||||
### Linux
|
### Linux
|
||||||
|
|
||||||
```make
|
```make
|
||||||
FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl
|
FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl -labseil
|
||||||
CC=clang++
|
CC=clang++
|
||||||
|
|
||||||
main: main.o
|
main: main.o
|
||||||
@@ -110,12 +110,13 @@ clean:
|
|||||||
### macOS
|
### macOS
|
||||||
|
|
||||||
```make
|
```make
|
||||||
FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl
|
FILAMENT_LIBS=-lfilament -lbackend -lbluegl -lbluevk -lfilabridge -lfilaflat -lutils -lgeometry -lsmol-v -lvkshaders -libl -labseil
|
||||||
FRAMEWORKS=-framework Cocoa -framework Metal -framework CoreVideo
|
FRAMEWORKS=-framework Cocoa -framework Metal -framework CoreVideo
|
||||||
CC=clang++
|
CC=clang++
|
||||||
|
ARCH ?= $(shell uname -m)
|
||||||
|
|
||||||
main: main.o
|
main: main.o
|
||||||
$(CC) -Llib/x86_64/ main.o $(FILAMENT_LIBS) $(FRAMEWORKS) -o main
|
$(CC) -Llib/$(ARCH)/ main.o $(FILAMENT_LIBS) $(FRAMEWORKS) -o main
|
||||||
|
|
||||||
main.o: main.cpp
|
main.o: main.cpp
|
||||||
$(CC) -Iinclude/ -std=c++17 -c main.cpp
|
$(CC) -Iinclude/ -std=c++17 -c main.cpp
|
||||||
@@ -139,7 +140,7 @@ used to change the run-time library version.
|
|||||||
|
|
||||||
```make
|
```make
|
||||||
FILAMENT_LIBS=filament.lib backend.lib bluegl.lib bluevk.lib filabridge.lib filaflat.lib \
|
FILAMENT_LIBS=filament.lib backend.lib bluegl.lib bluevk.lib filabridge.lib filaflat.lib \
|
||||||
utils.lib geometry.lib smol-v.lib ibl.lib vkshaders.lib
|
utils.lib geometry.lib smol-v.lib ibl.lib vkshaders.lib abseil.lib
|
||||||
CC=cl.exe
|
CC=cl.exe
|
||||||
|
|
||||||
main.exe: main.obj
|
main.exe: main.obj
|
||||||
|
|||||||
@@ -5,18 +5,6 @@ set(TARGET backend)
|
|||||||
set(PUBLIC_HDR_DIR include)
|
set(PUBLIC_HDR_DIR include)
|
||||||
set(GENERATION_ROOT ${CMAKE_CURRENT_BINARY_DIR})
|
set(GENERATION_ROOT ${CMAKE_CURRENT_BINARY_DIR})
|
||||||
|
|
||||||
# ==================================================================================================
|
|
||||||
# Compilation options
|
|
||||||
# ==================================================================================================
|
|
||||||
#
|
|
||||||
set(BACKEND_SANITIZATION "" CACHE STRING "Sanitization option")
|
|
||||||
set_property(CACHE BACKEND_SANITIZATION PROPERTY STRINGS ";ASAN")
|
|
||||||
|
|
||||||
set(BACKEND_SANITIZERS)
|
|
||||||
if (BACKEND_SANITIZATION STREQUAL "ASAN")
|
|
||||||
set(BACKEND_SANITIZERS -fsanitize=address)
|
|
||||||
endif()
|
|
||||||
|
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
# Sources and headers
|
# Sources and headers
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
@@ -192,8 +180,11 @@ if (FILAMENT_SUPPORTS_VULKAN)
|
|||||||
src/vulkan/VulkanAsyncHandles.h
|
src/vulkan/VulkanAsyncHandles.h
|
||||||
src/vulkan/VulkanBlitter.cpp
|
src/vulkan/VulkanBlitter.cpp
|
||||||
src/vulkan/VulkanBlitter.h
|
src/vulkan/VulkanBlitter.h
|
||||||
src/vulkan/VulkanBuffer.cpp
|
|
||||||
src/vulkan/VulkanBuffer.h
|
src/vulkan/VulkanBuffer.h
|
||||||
|
src/vulkan/VulkanBufferCache.h
|
||||||
|
src/vulkan/VulkanBufferCache.cpp
|
||||||
|
src/vulkan/VulkanBufferProxy.h
|
||||||
|
src/vulkan/VulkanBufferProxy.cpp
|
||||||
src/vulkan/VulkanCommands.cpp
|
src/vulkan/VulkanCommands.cpp
|
||||||
src/vulkan/VulkanCommands.h
|
src/vulkan/VulkanCommands.h
|
||||||
src/vulkan/VulkanConstants.h
|
src/vulkan/VulkanConstants.h
|
||||||
@@ -266,16 +257,42 @@ if (FILAMENT_SUPPORTS_WEBGPU)
|
|||||||
list(APPEND SRCS
|
list(APPEND SRCS
|
||||||
include/backend/platforms/WebGPUPlatform.h
|
include/backend/platforms/WebGPUPlatform.h
|
||||||
src/webgpu/platform/WebGPUPlatform.cpp
|
src/webgpu/platform/WebGPUPlatform.cpp
|
||||||
|
src/webgpu/SpdMipmapGenerator/SpdMipmapGenerator.cpp
|
||||||
|
src/webgpu/WebGPUBufferBase.cpp
|
||||||
|
src/webgpu/WebGPUBufferBase.h
|
||||||
|
src/webgpu/WebGPUBufferObject.cpp
|
||||||
|
src/webgpu/WebGPUBufferObject.h
|
||||||
src/webgpu/WebGPUConstants.h
|
src/webgpu/WebGPUConstants.h
|
||||||
|
src/webgpu/WebGPUDescriptorSet.cpp
|
||||||
|
src/webgpu/WebGPUDescriptorSet.h
|
||||||
|
src/webgpu/WebGPUDescriptorSetLayout.cpp
|
||||||
|
src/webgpu/WebGPUDescriptorSetLayout.h
|
||||||
src/webgpu/WebGPUDriver.cpp
|
src/webgpu/WebGPUDriver.cpp
|
||||||
src/webgpu/WebGPUDriver.h
|
src/webgpu/WebGPUDriver.h
|
||||||
src/webgpu/WebGPUHandles.cpp
|
src/webgpu/WebGPUFence.cpp
|
||||||
src/webgpu/WebGPUHandles.h
|
src/webgpu/WebGPUFence.h
|
||||||
|
src/webgpu/WebGPUIndexBuffer.cpp
|
||||||
|
src/webgpu/WebGPUIndexBuffer.h
|
||||||
|
src/webgpu/WebGPUMsaaTextureResolver.cpp
|
||||||
|
src/webgpu/WebGPUMsaaTextureResolver.h
|
||||||
src/webgpu/WebGPUPipelineCreation.cpp
|
src/webgpu/WebGPUPipelineCreation.cpp
|
||||||
src/webgpu/WebGPUPipelineCreation.h
|
src/webgpu/WebGPUPipelineCreation.h
|
||||||
|
src/webgpu/WebGPUProgram.cpp
|
||||||
|
src/webgpu/WebGPUProgram.h
|
||||||
|
src/webgpu/WebGPURenderPassMipmapGenerator.cpp
|
||||||
|
src/webgpu/WebGPURenderPassMipmapGenerator.h
|
||||||
|
src/webgpu/WebGPURenderPrimitive.h
|
||||||
|
src/webgpu/WebGPURenderTarget.cpp
|
||||||
|
src/webgpu/WebGPURenderTarget.h
|
||||||
|
src/webgpu/WebGPUStrings.h
|
||||||
src/webgpu/WebGPUSwapChain.cpp
|
src/webgpu/WebGPUSwapChain.cpp
|
||||||
src/webgpu/WebGPUSwapChain.h
|
src/webgpu/WebGPUSwapChain.h
|
||||||
src/webgpu/WGPUProgram.cpp
|
src/webgpu/WebGPUTexture.cpp
|
||||||
|
src/webgpu/WebGPUTexture.h
|
||||||
|
src/webgpu/WebGPUVertexBuffer.cpp
|
||||||
|
src/webgpu/WebGPUVertexBuffer.h
|
||||||
|
src/webgpu/WebGPUVertexBufferInfo.cpp
|
||||||
|
src/webgpu/WebGPUVertexBufferInfo.h
|
||||||
)
|
)
|
||||||
if (WIN32)
|
if (WIN32)
|
||||||
list(APPEND SRCS src/webgpu/platform/WebGPUPlatformWindows.cpp)
|
list(APPEND SRCS src/webgpu/platform/WebGPUPlatformWindows.cpp)
|
||||||
@@ -302,12 +319,6 @@ if (ANDROID)
|
|||||||
list(APPEND SRCS src/BackendUtilsAndroid.cpp)
|
list(APPEND SRCS src/BackendUtilsAndroid.cpp)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
# ==================================================================================================
|
|
||||||
# Definitions
|
|
||||||
# ==================================================================================================
|
|
||||||
# "2" corresponds to SYSTRACE_TAG_FILEMENT (See: utils/Systrace.h)
|
|
||||||
add_definitions(-DSYSTRACE_TAG=2 )
|
|
||||||
|
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
# Includes & target definition
|
# Includes & target definition
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
@@ -399,6 +410,10 @@ endif()
|
|||||||
target_link_libraries(${TARGET} PUBLIC math)
|
target_link_libraries(${TARGET} PUBLIC math)
|
||||||
target_link_libraries(${TARGET} PUBLIC utils)
|
target_link_libraries(${TARGET} PUBLIC utils)
|
||||||
|
|
||||||
|
if (FILAMENT_USE_ABSEIL_LOGGING)
|
||||||
|
target_link_libraries(${TARGET} PRIVATE absl::log)
|
||||||
|
endif()
|
||||||
|
|
||||||
# Android, iOS, and WebGL do not use bluegl.
|
# Android, iOS, and WebGL do not use bluegl.
|
||||||
if(FILAMENT_SUPPORTS_OPENGL AND NOT IOS AND NOT ANDROID AND NOT WEBGL)
|
if(FILAMENT_SUPPORTS_OPENGL AND NOT IOS AND NOT ANDROID AND NOT WEBGL)
|
||||||
target_link_libraries(${TARGET} PRIVATE bluegl)
|
target_link_libraries(${TARGET} PRIVATE bluegl)
|
||||||
@@ -484,7 +499,6 @@ target_compile_options(${TARGET} PRIVATE
|
|||||||
${OSMESA_COMPILE_FLAGS}
|
${OSMESA_COMPILE_FLAGS}
|
||||||
$<$<CONFIG:Release>:${OPTIMIZATION_FLAGS}>
|
$<$<CONFIG:Release>:${OPTIMIZATION_FLAGS}>
|
||||||
$<$<AND:$<PLATFORM_ID:Darwin>,$<CONFIG:Release>>:${DARWIN_OPTIMIZATION_FLAGS}>
|
$<$<AND:$<PLATFORM_ID:Darwin>,$<CONFIG:Release>>:${DARWIN_OPTIMIZATION_FLAGS}>
|
||||||
${BACKEND_SANITIZERS}
|
|
||||||
)
|
)
|
||||||
|
|
||||||
if (FILAMENT_SUPPORTS_METAL)
|
if (FILAMENT_SUPPORTS_METAL)
|
||||||
@@ -495,13 +509,20 @@ if (FILAMENT_SUPPORTS_WEBGPU)
|
|||||||
target_compile_definitions(${TARGET} PRIVATE $<$<BOOL:${FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING}>:FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING>)
|
target_compile_definitions(${TARGET} PRIVATE $<$<BOOL:${FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING}>:FILAMENT_WEBGPU_IMMEDIATE_ERROR_HANDLING>)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
target_link_options(${TARGET} PRIVATE ${BACKEND_SANITIZERS})
|
# ==================================================================================================
|
||||||
|
# Linker flags
|
||||||
|
# ==================================================================================================
|
||||||
|
|
||||||
target_link_libraries(${TARGET} PRIVATE
|
target_link_libraries(${TARGET} PRIVATE
|
||||||
${OSMESA_LINKER_FLAGS}
|
|
||||||
$<$<AND:$<PLATFORM_ID:Linux>,$<CONFIG:Release>>:${LINUX_LINKER_OPTIMIZATION_FLAGS}>
|
$<$<AND:$<PLATFORM_ID:Linux>,$<CONFIG:Release>>:${LINUX_LINKER_OPTIMIZATION_FLAGS}>
|
||||||
)
|
)
|
||||||
|
|
||||||
|
if (LINUX AND FILAMENT_SUPPORTS_WEBGPU)
|
||||||
|
# Unclear why this needs to be explicit while other linux libs do not, but it is necessary for
|
||||||
|
# WebGPU to build on linux.
|
||||||
|
target_link_libraries(${TARGET} PRIVATE -lxcb)
|
||||||
|
endif()
|
||||||
|
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
# Installation
|
# Installation
|
||||||
# ==================================================================================================
|
# ==================================================================================================
|
||||||
@@ -566,8 +587,6 @@ if (APPLE AND NOT IOS)
|
|||||||
test/test_RenderExternalImage.cpp)
|
test/test_RenderExternalImage.cpp)
|
||||||
add_library(backend_test STATIC ${BACKEND_TEST_SRC})
|
add_library(backend_test STATIC ${BACKEND_TEST_SRC})
|
||||||
target_link_libraries(backend_test PUBLIC ${BACKEND_TEST_LIBS})
|
target_link_libraries(backend_test PUBLIC ${BACKEND_TEST_LIBS})
|
||||||
target_compile_options(backend_test PRIVATE ${BACKEND_SANITIZERS})
|
|
||||||
target_link_options(backend_test PRIVATE ${BACKEND_SANITIZERS})
|
|
||||||
|
|
||||||
set(BACKEND_TEST_DEPS
|
set(BACKEND_TEST_DEPS
|
||||||
OSDependent
|
OSDependent
|
||||||
@@ -606,7 +625,6 @@ if (APPLE AND NOT IOS)
|
|||||||
# linker from removing "unused" symbols.
|
# linker from removing "unused" symbols.
|
||||||
target_link_libraries(backend_test_mac PRIVATE -force_load backend_test)
|
target_link_libraries(backend_test_mac PRIVATE -force_load backend_test)
|
||||||
set_target_properties(backend_test_mac PROPERTIES FOLDER Tests)
|
set_target_properties(backend_test_mac PROPERTIES FOLDER Tests)
|
||||||
target_link_options(backend_test_mac PRIVATE ${BACKEND_SANITIZERS})
|
|
||||||
|
|
||||||
# This is needed after XCode 15.3
|
# This is needed after XCode 15.3
|
||||||
set_target_properties(backend_test_mac PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
|
set_target_properties(backend_test_mac PROPERTIES BUILD_WITH_INSTALL_RPATH TRUE)
|
||||||
@@ -616,8 +634,6 @@ endif()
|
|||||||
|
|
||||||
if (LINUX)
|
if (LINUX)
|
||||||
add_executable(backend_test_linux test/linux_runner.cpp ${BACKEND_TEST_SRC})
|
add_executable(backend_test_linux test/linux_runner.cpp ${BACKEND_TEST_SRC})
|
||||||
target_compile_options(backend_test_linux PRIVATE ${BACKEND_SANITIZERS})
|
|
||||||
target_link_options(backend_test_linux PRIVATE ${BACKEND_SANITIZERS})
|
|
||||||
target_link_libraries(backend_test_linux PRIVATE ${BACKEND_TEST_LIBS})
|
target_link_libraries(backend_test_linux PRIVATE ${BACKEND_TEST_LIBS})
|
||||||
set_target_properties(backend_test_linux PROPERTIES FOLDER Tests)
|
set_target_properties(backend_test_linux PROPERTIES FOLDER Tests)
|
||||||
endif()
|
endif()
|
||||||
|
|||||||
@@ -20,10 +20,15 @@
|
|||||||
#define TNT_FILAMENT_BACKEND_BUFFERDESCRIPTOR_H
|
#define TNT_FILAMENT_BACKEND_BUFFERDESCRIPTOR_H
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
class CallbackHandler;
|
class CallbackHandler;
|
||||||
@@ -89,8 +94,8 @@ public:
|
|||||||
* @param callback A callback used to release the CPU buffer from this BufferDescriptor
|
* @param callback A callback used to release the CPU buffer from this BufferDescriptor
|
||||||
* @param user An opaque user pointer passed to the callback function when it's called
|
* @param user An opaque user pointer passed to the callback function when it's called
|
||||||
*/
|
*/
|
||||||
BufferDescriptor(void const* buffer, size_t size,
|
BufferDescriptor(void const* buffer, size_t const size,
|
||||||
Callback callback = nullptr, void* user = nullptr) noexcept
|
Callback const callback = nullptr, void* user = nullptr) noexcept
|
||||||
: buffer(const_cast<void*>(buffer)), size(size), mCallback(callback), mUser(user) {
|
: buffer(const_cast<void*>(buffer)), size(size), mCallback(callback), mUser(user) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -98,11 +103,12 @@ public:
|
|||||||
* Creates a BufferDescriptor that references a CPU memory-buffer
|
* Creates a BufferDescriptor that references a CPU memory-buffer
|
||||||
* @param buffer Memory address of the CPU buffer to reference
|
* @param buffer Memory address of the CPU buffer to reference
|
||||||
* @param size Size of the CPU buffer in bytes
|
* @param size Size of the CPU buffer in bytes
|
||||||
|
* @param handler A custom handler for the callback
|
||||||
* @param callback A callback used to release the CPU buffer from this BufferDescriptor
|
* @param callback A callback used to release the CPU buffer from this BufferDescriptor
|
||||||
* @param user An opaque user pointer passed to the callback function when it's called
|
* @param user An opaque user pointer passed to the callback function when it's called
|
||||||
*/
|
*/
|
||||||
BufferDescriptor(void const* buffer, size_t size,
|
BufferDescriptor(void const* buffer, size_t const size,
|
||||||
CallbackHandler* handler, Callback callback, void* user = nullptr) noexcept
|
CallbackHandler* handler, Callback const callback, void* user = nullptr) noexcept
|
||||||
: buffer(const_cast<void*>(buffer)), size(size),
|
: buffer(const_cast<void*>(buffer)), size(size),
|
||||||
mCallback(callback), mUser(user), mHandler(handler) {
|
mCallback(callback), mUser(user), mHandler(handler) {
|
||||||
}
|
}
|
||||||
@@ -116,8 +122,9 @@ public:
|
|||||||
*
|
*
|
||||||
* @param buffer Memory address of the CPU buffer to reference
|
* @param buffer Memory address of the CPU buffer to reference
|
||||||
* @param size Size of the CPU buffer in bytes
|
* @param size Size of the CPU buffer in bytes
|
||||||
|
* @param data A pointer to the data
|
||||||
* @param handler Handler to use to dispatch the callback, or nullptr for the default handler
|
* @param handler Handler to use to dispatch the callback, or nullptr for the default handler
|
||||||
* @return a new BufferDescriptor
|
* @return A new BufferDescriptor
|
||||||
*/
|
*/
|
||||||
template<typename T, void(T::*method)(void const*, size_t)>
|
template<typename T, void(T::*method)(void const*, size_t)>
|
||||||
static BufferDescriptor make(void const* buffer, size_t size, T* data,
|
static BufferDescriptor make(void const* buffer, size_t size, T* data,
|
||||||
@@ -164,7 +171,7 @@ public:
|
|||||||
* @param callback The new callback function
|
* @param callback The new callback function
|
||||||
* @param user An opaque user pointer passed to the callbeck function when it's called
|
* @param user An opaque user pointer passed to the callbeck function when it's called
|
||||||
*/
|
*/
|
||||||
void setCallback(Callback callback, void* user = nullptr) noexcept {
|
void setCallback(Callback const callback, void* user = nullptr) noexcept {
|
||||||
this->mCallback = callback;
|
this->mCallback = callback;
|
||||||
this->mUser = user;
|
this->mUser = user;
|
||||||
this->mHandler = nullptr;
|
this->mHandler = nullptr;
|
||||||
@@ -176,7 +183,7 @@ public:
|
|||||||
* @param callback The new callback function
|
* @param callback The new callback function
|
||||||
* @param user An opaque user pointer passed to the callbeck function when it's called
|
* @param user An opaque user pointer passed to the callbeck function when it's called
|
||||||
*/
|
*/
|
||||||
void setCallback(CallbackHandler* handler, Callback callback, void* user = nullptr) noexcept {
|
void setCallback(CallbackHandler* handler, Callback const callback, void* user = nullptr) noexcept {
|
||||||
mCallback = callback;
|
mCallback = callback;
|
||||||
mUser = user;
|
mUser = user;
|
||||||
mHandler = handler;
|
mHandler = handler;
|
||||||
|
|||||||
@@ -19,8 +19,6 @@
|
|||||||
|
|
||||||
#include <backend/DriverApiForward.h>
|
#include <backend/DriverApiForward.h>
|
||||||
|
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
|
||||||
#include <initializer_list>
|
#include <initializer_list>
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@@ -28,6 +26,10 @@
|
|||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
void* allocateFromCommandStream(DriverApi& driver, size_t size, size_t alignment) noexcept;
|
void* allocateFromCommandStream(DriverApi& driver, size_t size, size_t alignment) noexcept;
|
||||||
|
|||||||
@@ -25,21 +25,26 @@
|
|||||||
#include <backend/PresentCallable.h>
|
#include <backend/PresentCallable.h>
|
||||||
|
|
||||||
#include <utils/BitmaskEnum.h>
|
#include <utils/BitmaskEnum.h>
|
||||||
|
#include <utils/CString.h>
|
||||||
#include <utils/FixedCapacityVector.h>
|
#include <utils/FixedCapacityVector.h>
|
||||||
#include <utils/Invocable.h>
|
#include <utils/Invocable.h>
|
||||||
#include <utils/compiler.h>
|
#include <utils/StaticString.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
|
||||||
#include <math/vec4.h>
|
#include <math/vec4.h>
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <type_traits>
|
#include <type_traits>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
|
#include <string_view>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Types and enums used by filament's driver.
|
* Types and enums used by filament's driver.
|
||||||
*
|
*
|
||||||
@@ -158,7 +163,7 @@ enum class TimerQueryResult : int8_t {
|
|||||||
AVAILABLE = 1, // result is available
|
AVAILABLE = 1, // result is available
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr const char* backendToString(Backend backend) {
|
constexpr std::string_view to_string(Backend const backend) noexcept {
|
||||||
switch (backend) {
|
switch (backend) {
|
||||||
case Backend::NOOP:
|
case Backend::NOOP:
|
||||||
return "Noop";
|
return "Noop";
|
||||||
@@ -170,9 +175,10 @@ static constexpr const char* backendToString(Backend backend) {
|
|||||||
return "Metal";
|
return "Metal";
|
||||||
case Backend::WEBGPU:
|
case Backend::WEBGPU:
|
||||||
return "WebGPU";
|
return "WebGPU";
|
||||||
default:
|
case Backend::DEFAULT:
|
||||||
return "Unknown";
|
return "Default";
|
||||||
}
|
}
|
||||||
|
return "Unknown";
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -189,7 +195,7 @@ enum class ShaderLanguage {
|
|||||||
WGSL = 5,
|
WGSL = 5,
|
||||||
};
|
};
|
||||||
|
|
||||||
static constexpr const char* shaderLanguageToString(ShaderLanguage shaderLanguage) {
|
constexpr const char* shaderLanguageToString(ShaderLanguage shaderLanguage) noexcept {
|
||||||
switch (shaderLanguage) {
|
switch (shaderLanguage) {
|
||||||
case ShaderLanguage::ESSL1:
|
case ShaderLanguage::ESSL1:
|
||||||
return "ESSL 1.0";
|
return "ESSL 1.0";
|
||||||
@@ -204,6 +210,7 @@ static constexpr const char* shaderLanguageToString(ShaderLanguage shaderLanguag
|
|||||||
case ShaderLanguage::WGSL:
|
case ShaderLanguage::WGSL:
|
||||||
return "WGSL";
|
return "WGSL";
|
||||||
}
|
}
|
||||||
|
return "UNKNOWN";
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class ShaderStage : uint8_t {
|
enum class ShaderStage : uint8_t {
|
||||||
@@ -221,7 +228,7 @@ enum class ShaderStageFlags : uint8_t {
|
|||||||
ALL_SHADER_STAGE_FLAGS = VERTEX | FRAGMENT | COMPUTE
|
ALL_SHADER_STAGE_FLAGS = VERTEX | FRAGMENT | COMPUTE
|
||||||
};
|
};
|
||||||
|
|
||||||
static inline constexpr bool hasShaderType(ShaderStageFlags flags, ShaderStage type) noexcept {
|
constexpr bool hasShaderType(ShaderStageFlags flags, ShaderStage type) noexcept {
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case ShaderStage::VERTEX:
|
case ShaderStage::VERTEX:
|
||||||
return bool(uint8_t(flags) & uint8_t(ShaderStageFlags::VERTEX));
|
return bool(uint8_t(flags) & uint8_t(ShaderStageFlags::VERTEX));
|
||||||
@@ -232,17 +239,247 @@ static inline constexpr bool hasShaderType(ShaderStageFlags flags, ShaderStage t
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
enum class DescriptorType : uint8_t {
|
enum class TextureType : uint8_t {
|
||||||
UNIFORM_BUFFER,
|
FLOAT,
|
||||||
SHADER_STORAGE_BUFFER,
|
INT,
|
||||||
SAMPLER,
|
UINT,
|
||||||
INPUT_ATTACHMENT,
|
DEPTH,
|
||||||
SAMPLER_EXTERNAL
|
STENCIL,
|
||||||
|
DEPTH_STENCIL
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr std::string_view to_string(TextureType type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case TextureType::FLOAT: return "FLOAT";
|
||||||
|
case TextureType::INT: return "INT";
|
||||||
|
case TextureType::UINT: return "UINT";
|
||||||
|
case TextureType::DEPTH: return "DEPTH";
|
||||||
|
case TextureType::STENCIL: return "STENCIL";
|
||||||
|
case TextureType::DEPTH_STENCIL: return "DEPTH_STENCIL";
|
||||||
|
}
|
||||||
|
return "UNKNOWN";
|
||||||
|
}
|
||||||
|
|
||||||
|
enum class DescriptorType : uint8_t {
|
||||||
|
SAMPLER_2D_FLOAT,
|
||||||
|
SAMPLER_2D_INT,
|
||||||
|
SAMPLER_2D_UINT,
|
||||||
|
SAMPLER_2D_DEPTH,
|
||||||
|
|
||||||
|
SAMPLER_2D_ARRAY_FLOAT,
|
||||||
|
SAMPLER_2D_ARRAY_INT,
|
||||||
|
SAMPLER_2D_ARRAY_UINT,
|
||||||
|
SAMPLER_2D_ARRAY_DEPTH,
|
||||||
|
|
||||||
|
SAMPLER_CUBE_FLOAT,
|
||||||
|
SAMPLER_CUBE_INT,
|
||||||
|
SAMPLER_CUBE_UINT,
|
||||||
|
SAMPLER_CUBE_DEPTH,
|
||||||
|
|
||||||
|
SAMPLER_CUBE_ARRAY_FLOAT,
|
||||||
|
SAMPLER_CUBE_ARRAY_INT,
|
||||||
|
SAMPLER_CUBE_ARRAY_UINT,
|
||||||
|
SAMPLER_CUBE_ARRAY_DEPTH,
|
||||||
|
|
||||||
|
SAMPLER_3D_FLOAT,
|
||||||
|
SAMPLER_3D_INT,
|
||||||
|
SAMPLER_3D_UINT,
|
||||||
|
|
||||||
|
SAMPLER_2D_MS_FLOAT,
|
||||||
|
SAMPLER_2D_MS_INT,
|
||||||
|
SAMPLER_2D_MS_UINT,
|
||||||
|
|
||||||
|
SAMPLER_2D_MS_ARRAY_FLOAT,
|
||||||
|
SAMPLER_2D_MS_ARRAY_INT,
|
||||||
|
SAMPLER_2D_MS_ARRAY_UINT,
|
||||||
|
|
||||||
|
SAMPLER_EXTERNAL,
|
||||||
|
UNIFORM_BUFFER,
|
||||||
|
SHADER_STORAGE_BUFFER,
|
||||||
|
INPUT_ATTACHMENT,
|
||||||
|
};
|
||||||
|
|
||||||
|
constexpr bool isDepthDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_DEPTH:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isFloatDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_3D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_FLOAT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isIntDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_3D_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_INT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isUnsignedIntDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_3D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_UINT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool is3dTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_3D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_3D_INT:
|
||||||
|
case DescriptorType::SAMPLER_3D_UINT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool is2dTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_UINT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool is2dArrayTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_UINT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isCubeTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_CUBE_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_DEPTH:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isCubeArrayTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_DEPTH:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr bool isMultiSampledTypeDescriptor(DescriptorType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_UINT:
|
||||||
|
return true;
|
||||||
|
default: ;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
constexpr std::string_view to_string(DescriptorType type) noexcept {
|
||||||
|
#define DESCRIPTOR_TYPE_CASE(TYPE) case DescriptorType::TYPE: return #TYPE;
|
||||||
|
switch (type) {
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_DEPTH)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_ARRAY_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_ARRAY_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_ARRAY_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_ARRAY_DEPTH)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_DEPTH)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_ARRAY_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_ARRAY_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_ARRAY_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_CUBE_ARRAY_DEPTH)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_3D_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_3D_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_3D_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_ARRAY_FLOAT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_ARRAY_INT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_2D_MS_ARRAY_UINT)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SAMPLER_EXTERNAL)
|
||||||
|
DESCRIPTOR_TYPE_CASE(UNIFORM_BUFFER)
|
||||||
|
DESCRIPTOR_TYPE_CASE(SHADER_STORAGE_BUFFER)
|
||||||
|
DESCRIPTOR_TYPE_CASE(INPUT_ATTACHMENT)
|
||||||
|
}
|
||||||
|
return "UNKNOWN";
|
||||||
|
#undef DESCRIPTOR_TYPE_CASE
|
||||||
|
}
|
||||||
|
|
||||||
enum class DescriptorFlags : uint8_t {
|
enum class DescriptorFlags : uint8_t {
|
||||||
NONE = 0x00,
|
NONE = 0x00,
|
||||||
DYNAMIC_OFFSET = 0x01
|
|
||||||
|
// Indicate a UNIFORM_BUFFER will have dynamic offsets.
|
||||||
|
DYNAMIC_OFFSET = 0x01,
|
||||||
|
|
||||||
|
// To indicate a texture/sampler type should be unfiltered.
|
||||||
|
UNFILTERABLE = 0x02,
|
||||||
};
|
};
|
||||||
|
|
||||||
using descriptor_set_t = uint8_t;
|
using descriptor_set_t = uint8_t;
|
||||||
@@ -250,24 +487,25 @@ using descriptor_set_t = uint8_t;
|
|||||||
using descriptor_binding_t = uint8_t;
|
using descriptor_binding_t = uint8_t;
|
||||||
|
|
||||||
struct DescriptorSetLayoutBinding {
|
struct DescriptorSetLayoutBinding {
|
||||||
|
static bool isSampler(DescriptorType type) noexcept {
|
||||||
|
return int(type) <= int(DescriptorType::SAMPLER_EXTERNAL);
|
||||||
|
}
|
||||||
|
static bool isBuffer(DescriptorType type) noexcept {
|
||||||
|
return type == DescriptorType::UNIFORM_BUFFER ||
|
||||||
|
type == DescriptorType::SHADER_STORAGE_BUFFER;
|
||||||
|
}
|
||||||
DescriptorType type;
|
DescriptorType type;
|
||||||
ShaderStageFlags stageFlags;
|
ShaderStageFlags stageFlags;
|
||||||
descriptor_binding_t binding;
|
descriptor_binding_t binding;
|
||||||
DescriptorFlags flags = DescriptorFlags::NONE;
|
DescriptorFlags flags = DescriptorFlags::NONE;
|
||||||
uint16_t count = 0;
|
uint16_t count = 0;
|
||||||
|
|
||||||
// TODO: uncomment when needed. Note that this class is used as hash key. We need to ensure
|
friend bool operator==(DescriptorSetLayoutBinding const& lhs,
|
||||||
// no uninitialized padding bytes.
|
|
||||||
// uint8_t externalSamplerDataIndex = EXTERNAL_SAMPLER_DATA_INDEX_UNUSED;
|
|
||||||
|
|
||||||
friend inline bool operator==(DescriptorSetLayoutBinding const& lhs,
|
|
||||||
DescriptorSetLayoutBinding const& rhs) noexcept {
|
DescriptorSetLayoutBinding const& rhs) noexcept {
|
||||||
return lhs.type == rhs.type &&
|
return lhs.type == rhs.type &&
|
||||||
lhs.flags == rhs.flags &&
|
lhs.flags == rhs.flags &&
|
||||||
lhs.count == rhs.count &&
|
lhs.count == rhs.count &&
|
||||||
lhs.stageFlags == rhs.stageFlags;
|
lhs.stageFlags == rhs.stageFlags;
|
||||||
// lhs.stageFlags == rhs.stageFlags &&
|
|
||||||
// lhs.externalSamplerDataIndex == rhs.externalSamplerDataIndex;
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -293,7 +531,7 @@ enum class TargetBufferFlags : uint32_t {
|
|||||||
ALL = COLOR_ALL | DEPTH | STENCIL //!< Color, depth and stencil buffer selected.
|
ALL = COLOR_ALL | DEPTH | STENCIL //!< Color, depth and stencil buffer selected.
|
||||||
};
|
};
|
||||||
|
|
||||||
inline constexpr TargetBufferFlags getTargetBufferFlagsAt(size_t index) noexcept {
|
constexpr TargetBufferFlags getTargetBufferFlagsAt(size_t index) noexcept {
|
||||||
if (index == 0u) return TargetBufferFlags::COLOR0;
|
if (index == 0u) return TargetBufferFlags::COLOR0;
|
||||||
if (index == 1u) return TargetBufferFlags::COLOR1;
|
if (index == 1u) return TargetBufferFlags::COLOR1;
|
||||||
if (index == 2u) return TargetBufferFlags::COLOR2;
|
if (index == 2u) return TargetBufferFlags::COLOR2;
|
||||||
@@ -450,6 +688,24 @@ enum class SamplerType : uint8_t {
|
|||||||
SAMPLER_CUBEMAP_ARRAY, //!< Cube map array texture (feature level 2)
|
SAMPLER_CUBEMAP_ARRAY, //!< Cube map array texture (feature level 2)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr std::string_view to_string(SamplerType const type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case SamplerType::SAMPLER_2D:
|
||||||
|
return "SAMPLER_2D";
|
||||||
|
case SamplerType::SAMPLER_2D_ARRAY:
|
||||||
|
return "SAMPLER_2D_ARRAY";
|
||||||
|
case SamplerType::SAMPLER_CUBEMAP:
|
||||||
|
return "SAMPLER_CUBEMAP";
|
||||||
|
case SamplerType::SAMPLER_EXTERNAL:
|
||||||
|
return "SAMPLER_EXTERNAL";
|
||||||
|
case SamplerType::SAMPLER_3D:
|
||||||
|
return "SAMPLER_3D";
|
||||||
|
case SamplerType::SAMPLER_CUBEMAP_ARRAY:
|
||||||
|
return "SAMPLER_CUBEMAP_ARRAY";
|
||||||
|
}
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
|
||||||
//! Subpass type
|
//! Subpass type
|
||||||
enum class SubpassType : uint8_t {
|
enum class SubpassType : uint8_t {
|
||||||
SUBPASS_INPUT
|
SUBPASS_INPUT
|
||||||
@@ -463,6 +719,20 @@ enum class SamplerFormat : uint8_t {
|
|||||||
SHADOW = 3 //!< shadow sampler (PCF)
|
SHADOW = 3 //!< shadow sampler (PCF)
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr std::string_view to_string(SamplerFormat const format) noexcept {
|
||||||
|
switch (format) {
|
||||||
|
case SamplerFormat::INT:
|
||||||
|
return "INT";
|
||||||
|
case SamplerFormat::UINT:
|
||||||
|
return "UINT";
|
||||||
|
case SamplerFormat::FLOAT:
|
||||||
|
return "FLOAT";
|
||||||
|
case SamplerFormat::SHADOW:
|
||||||
|
return "SHADOW";
|
||||||
|
}
|
||||||
|
return "Unknown";
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Supported element types
|
* Supported element types
|
||||||
*/
|
*/
|
||||||
@@ -502,6 +772,15 @@ enum class BufferObjectBinding : uint8_t {
|
|||||||
SHADER_STORAGE
|
SHADER_STORAGE
|
||||||
};
|
};
|
||||||
|
|
||||||
|
constexpr std::string_view to_string(BufferObjectBinding type) noexcept {
|
||||||
|
switch (type) {
|
||||||
|
case BufferObjectBinding::VERTEX: return "VERTEX";
|
||||||
|
case BufferObjectBinding::UNIFORM: return "UNIFORM";
|
||||||
|
case BufferObjectBinding::SHADER_STORAGE: return "SHADER_STORAGE";
|
||||||
|
}
|
||||||
|
return "UNKNOWN";
|
||||||
|
}
|
||||||
|
|
||||||
//! Face culling Mode
|
//! Face culling Mode
|
||||||
enum class CullingMode : uint8_t {
|
enum class CullingMode : uint8_t {
|
||||||
NONE, //!< No culling, front and back faces are visible
|
NONE, //!< No culling, front and back faces are visible
|
||||||
@@ -763,6 +1042,8 @@ enum class TextureFormat : uint16_t {
|
|||||||
SRGB_ALPHA_BPTC_UNORM, // BC7 sRGB
|
SRGB_ALPHA_BPTC_UNORM, // BC7 sRGB
|
||||||
};
|
};
|
||||||
|
|
||||||
|
TextureType getTextureType(TextureFormat format) noexcept;
|
||||||
|
|
||||||
//! Bitmask describing the intended Texture Usage
|
//! Bitmask describing the intended Texture Usage
|
||||||
enum class TextureUsage : uint16_t {
|
enum class TextureUsage : uint16_t {
|
||||||
NONE = 0x0000,
|
NONE = 0x0000,
|
||||||
@@ -790,7 +1071,7 @@ enum class TextureSwizzle : uint8_t {
|
|||||||
};
|
};
|
||||||
|
|
||||||
//! returns whether this format a depth format
|
//! returns whether this format a depth format
|
||||||
static constexpr bool isDepthFormat(TextureFormat format) noexcept {
|
constexpr bool isDepthFormat(TextureFormat format) noexcept {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case TextureFormat::DEPTH32F:
|
case TextureFormat::DEPTH32F:
|
||||||
case TextureFormat::DEPTH24:
|
case TextureFormat::DEPTH24:
|
||||||
@@ -803,7 +1084,7 @@ static constexpr bool isDepthFormat(TextureFormat format) noexcept {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr bool isStencilFormat(TextureFormat format) noexcept {
|
constexpr bool isStencilFormat(TextureFormat format) noexcept {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case TextureFormat::STENCIL8:
|
case TextureFormat::STENCIL8:
|
||||||
case TextureFormat::DEPTH24_STENCIL8:
|
case TextureFormat::DEPTH24_STENCIL8:
|
||||||
@@ -814,7 +1095,7 @@ static constexpr bool isStencilFormat(TextureFormat format) noexcept {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
inline constexpr bool isColorFormat(TextureFormat format) noexcept {
|
constexpr bool isColorFormat(TextureFormat format) noexcept {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
// Standard color formats
|
// Standard color formats
|
||||||
case TextureFormat::R8:
|
case TextureFormat::R8:
|
||||||
@@ -841,7 +1122,7 @@ inline constexpr bool isColorFormat(TextureFormat format) noexcept {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr bool isUnsignedIntFormat(TextureFormat format) {
|
constexpr bool isUnsignedIntFormat(TextureFormat format) {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case TextureFormat::R8UI:
|
case TextureFormat::R8UI:
|
||||||
case TextureFormat::R16UI:
|
case TextureFormat::R16UI:
|
||||||
@@ -862,7 +1143,7 @@ static constexpr bool isUnsignedIntFormat(TextureFormat format) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr bool isSignedIntFormat(TextureFormat format) {
|
constexpr bool isSignedIntFormat(TextureFormat format) {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case TextureFormat::R8I:
|
case TextureFormat::R8I:
|
||||||
case TextureFormat::R16I:
|
case TextureFormat::R16I:
|
||||||
@@ -884,35 +1165,35 @@ static constexpr bool isSignedIntFormat(TextureFormat format) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
//! returns whether this format is a compressed format
|
//! returns whether this format is a compressed format
|
||||||
static constexpr bool isCompressedFormat(TextureFormat format) noexcept {
|
constexpr bool isCompressedFormat(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::EAC_R11;
|
return format >= TextureFormat::EAC_R11;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! returns whether this format is an ETC2 compressed format
|
//! returns whether this format is an ETC2 compressed format
|
||||||
static constexpr bool isETC2Compression(TextureFormat format) noexcept {
|
constexpr bool isETC2Compression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::EAC_R11 && format <= TextureFormat::ETC2_EAC_SRGBA8;
|
return format >= TextureFormat::EAC_R11 && format <= TextureFormat::ETC2_EAC_SRGBA8;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! returns whether this format is an S3TC compressed format
|
//! returns whether this format is an S3TC compressed format
|
||||||
static constexpr bool isS3TCCompression(TextureFormat format) noexcept {
|
constexpr bool isS3TCCompression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::DXT1_RGB && format <= TextureFormat::DXT5_SRGBA;
|
return format >= TextureFormat::DXT1_RGB && format <= TextureFormat::DXT5_SRGBA;
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr bool isS3TCSRGBCompression(TextureFormat format) noexcept {
|
constexpr bool isS3TCSRGBCompression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::DXT1_SRGB && format <= TextureFormat::DXT5_SRGBA;
|
return format >= TextureFormat::DXT1_SRGB && format <= TextureFormat::DXT5_SRGBA;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! returns whether this format is an RGTC compressed format
|
//! returns whether this format is an RGTC compressed format
|
||||||
static constexpr bool isRGTCCompression(TextureFormat format) noexcept {
|
constexpr bool isRGTCCompression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::RED_RGTC1 && format <= TextureFormat::SIGNED_RED_GREEN_RGTC2;
|
return format >= TextureFormat::RED_RGTC1 && format <= TextureFormat::SIGNED_RED_GREEN_RGTC2;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! returns whether this format is an BPTC compressed format
|
//! returns whether this format is an BPTC compressed format
|
||||||
static constexpr bool isBPTCCompression(TextureFormat format) noexcept {
|
constexpr bool isBPTCCompression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::RGB_BPTC_SIGNED_FLOAT && format <= TextureFormat::SRGB_ALPHA_BPTC_UNORM;
|
return format >= TextureFormat::RGB_BPTC_SIGNED_FLOAT && format <= TextureFormat::SRGB_ALPHA_BPTC_UNORM;
|
||||||
}
|
}
|
||||||
|
|
||||||
static constexpr bool isASTCCompression(TextureFormat format) noexcept {
|
constexpr bool isASTCCompression(TextureFormat format) noexcept {
|
||||||
return format >= TextureFormat::RGBA_ASTC_4x4 && format <= TextureFormat::SRGB8_ALPHA8_ASTC_12x12;
|
return format >= TextureFormat::RGBA_ASTC_4x4 && format <= TextureFormat::SRGB8_ALPHA8_ASTC_12x12;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -972,26 +1253,6 @@ enum class SamplerCompareFunc : uint8_t {
|
|||||||
N //!< Never. The depth / stencil test always fails.
|
N //!< Never. The depth / stencil test always fails.
|
||||||
};
|
};
|
||||||
|
|
||||||
//! this API is copied from (and only applies to) the Vulkan spec.
|
|
||||||
//! These specify YUV to RGB conversions.
|
|
||||||
enum class SamplerYcbcrModelConversion : uint8_t {
|
|
||||||
RGB_IDENTITY = 0,
|
|
||||||
YCBCR_IDENTITY = 1,
|
|
||||||
YCBCR_709 = 2,
|
|
||||||
YCBCR_601 = 3,
|
|
||||||
YCBCR_2020 = 4,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class SamplerYcbcrRange : uint8_t {
|
|
||||||
ITU_FULL = 0,
|
|
||||||
ITU_NARROW = 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
enum class ChromaLocation : uint8_t {
|
|
||||||
COSITED_EVEN = 0,
|
|
||||||
MIDPOINT = 1,
|
|
||||||
};
|
|
||||||
|
|
||||||
//! Sampler parameters
|
//! Sampler parameters
|
||||||
struct SamplerParams { // NOLINT
|
struct SamplerParams { // NOLINT
|
||||||
SamplerMagFilter filterMag : 1; //!< magnification filter (NEAREST)
|
SamplerMagFilter filterMag : 1; //!< magnification filter (NEAREST)
|
||||||
@@ -1033,19 +1294,23 @@ struct SamplerParams { // NOLINT
|
|||||||
assert_invariant(lhs.padding2 == 0);
|
assert_invariant(lhs.padding2 == 0);
|
||||||
auto* pLhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&lhs));
|
auto* pLhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&lhs));
|
||||||
auto* pRhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&rhs));
|
auto* pRhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&rhs));
|
||||||
return *pLhs == *pRhs;
|
return *pLhs < *pRhs;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
bool isFiltered() const noexcept {
|
||||||
|
return filterMag != SamplerMagFilter::NEAREST || filterMin != SamplerMinFilter::NEAREST;
|
||||||
|
}
|
||||||
|
|
||||||
private:
|
private:
|
||||||
friend inline bool operator == (SamplerParams lhs, SamplerParams rhs) noexcept {
|
friend bool operator == (SamplerParams lhs, SamplerParams rhs) noexcept {
|
||||||
return SamplerParams::EqualTo{}(lhs, rhs);
|
return EqualTo{}(lhs, rhs);
|
||||||
}
|
}
|
||||||
friend inline bool operator != (SamplerParams lhs, SamplerParams rhs) noexcept {
|
friend bool operator != (SamplerParams lhs, SamplerParams rhs) noexcept {
|
||||||
return !SamplerParams::EqualTo{}(lhs, rhs);
|
return !EqualTo{}(lhs, rhs);
|
||||||
}
|
}
|
||||||
friend inline bool operator < (SamplerParams lhs, SamplerParams rhs) noexcept {
|
friend bool operator < (SamplerParams lhs, SamplerParams rhs) noexcept {
|
||||||
return SamplerParams::LessThan{}(lhs, rhs);
|
return LessThan{}(lhs, rhs);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -1056,93 +1321,9 @@ static_assert(sizeof(SamplerParams) == 4);
|
|||||||
static_assert(sizeof(SamplerParams) <= sizeof(uint64_t),
|
static_assert(sizeof(SamplerParams) <= sizeof(uint64_t),
|
||||||
"SamplerParams must be no more than 64 bits");
|
"SamplerParams must be no more than 64 bits");
|
||||||
|
|
||||||
//! Sampler parameters
|
|
||||||
struct SamplerYcbcrConversion {// NOLINT
|
|
||||||
SamplerYcbcrModelConversion ycbcrModel : 4;
|
|
||||||
TextureSwizzle r : 4;
|
|
||||||
TextureSwizzle g : 4;
|
|
||||||
TextureSwizzle b : 4;
|
|
||||||
TextureSwizzle a : 4;
|
|
||||||
SamplerYcbcrRange ycbcrRange : 1;
|
|
||||||
ChromaLocation xChromaOffset : 1;
|
|
||||||
ChromaLocation yChromaOffset : 1;
|
|
||||||
SamplerMagFilter chromaFilter : 1;
|
|
||||||
uint8_t padding;
|
|
||||||
|
|
||||||
struct Hasher {
|
|
||||||
size_t operator()(const SamplerYcbcrConversion p) const noexcept {
|
|
||||||
// we don't use std::hash<> here, so we don't have to include <functional>
|
|
||||||
return *reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&p));
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct EqualTo {
|
|
||||||
bool operator()(SamplerYcbcrConversion lhs, SamplerYcbcrConversion rhs) const noexcept {
|
|
||||||
assert_invariant(lhs.padding == 0);
|
|
||||||
auto* pLhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&lhs));
|
|
||||||
auto* pRhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&rhs));
|
|
||||||
return *pLhs == *pRhs;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
struct LessThan {
|
|
||||||
bool operator()(SamplerYcbcrConversion lhs, SamplerYcbcrConversion rhs) const noexcept {
|
|
||||||
assert_invariant(lhs.padding == 0);
|
|
||||||
auto* pLhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&lhs));
|
|
||||||
auto* pRhs = reinterpret_cast<uint32_t const*>(reinterpret_cast<char const*>(&rhs));
|
|
||||||
return *pLhs < *pRhs;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
private:
|
|
||||||
friend inline bool operator == (SamplerYcbcrConversion lhs, SamplerYcbcrConversion rhs)
|
|
||||||
noexcept {
|
|
||||||
return SamplerYcbcrConversion::EqualTo{}(lhs, rhs);
|
|
||||||
}
|
|
||||||
friend inline bool operator != (SamplerYcbcrConversion lhs, SamplerYcbcrConversion rhs)
|
|
||||||
noexcept {
|
|
||||||
return !SamplerYcbcrConversion::EqualTo{}(lhs, rhs);
|
|
||||||
}
|
|
||||||
friend inline bool operator < (SamplerYcbcrConversion lhs, SamplerYcbcrConversion rhs)
|
|
||||||
noexcept {
|
|
||||||
return SamplerYcbcrConversion::LessThan{}(lhs, rhs);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
static_assert(sizeof(SamplerYcbcrConversion) == 4);
|
|
||||||
|
|
||||||
static_assert(sizeof(SamplerYcbcrConversion) <= sizeof(uint64_t),
|
|
||||||
"SamplerYcbcrConversion must be no more than 64 bits");
|
|
||||||
|
|
||||||
struct ExternalSamplerDatum {
|
|
||||||
ExternalSamplerDatum(SamplerYcbcrConversion ycbcr, SamplerParams spm, uint32_t extFmt)
|
|
||||||
: YcbcrConversion(ycbcr),
|
|
||||||
samplerParams(spm),
|
|
||||||
externalFormat(extFmt) {}
|
|
||||||
bool operator==(ExternalSamplerDatum const& rhs) const {
|
|
||||||
return (YcbcrConversion == rhs.YcbcrConversion && samplerParams == rhs.samplerParams &&
|
|
||||||
externalFormat == rhs.externalFormat);
|
|
||||||
}
|
|
||||||
struct EqualTo {
|
|
||||||
bool operator()(const ExternalSamplerDatum& lhs,
|
|
||||||
const ExternalSamplerDatum& rhs) const noexcept {
|
|
||||||
return (lhs.YcbcrConversion == rhs.YcbcrConversion &&
|
|
||||||
lhs.samplerParams == rhs.samplerParams &&
|
|
||||||
lhs.externalFormat == rhs.externalFormat);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
SamplerYcbcrConversion YcbcrConversion;
|
|
||||||
SamplerParams samplerParams;
|
|
||||||
uint32_t externalFormat;
|
|
||||||
};
|
|
||||||
// No implicit padding allowed due to it being a hash key.
|
|
||||||
static_assert(sizeof(ExternalSamplerDatum) == 12);
|
|
||||||
|
|
||||||
struct DescriptorSetLayout {
|
struct DescriptorSetLayout {
|
||||||
|
std::variant<utils::StaticString, utils::CString, std::monostate> label;
|
||||||
utils::FixedCapacityVector<DescriptorSetLayoutBinding> bindings;
|
utils::FixedCapacityVector<DescriptorSetLayoutBinding> bindings;
|
||||||
|
|
||||||
// TODO: uncomment when needed
|
|
||||||
// utils::FixedCapacityVector<ExternalSamplerDatum> externalSamplerData;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
//! blending equation function
|
//! blending equation function
|
||||||
|
|||||||
@@ -17,9 +17,6 @@
|
|||||||
#ifndef TNT_FILAMENT_BACKEND_HANDLE_H
|
#ifndef TNT_FILAMENT_BACKEND_HANDLE_H
|
||||||
#define TNT_FILAMENT_BACKEND_HANDLE_H
|
#define TNT_FILAMENT_BACKEND_HANDLE_H
|
||||||
|
|
||||||
#if !defined(NDEBUG)
|
|
||||||
#include <utils/ostream.h>
|
|
||||||
#endif
|
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
|
|
||||||
#include <type_traits> // FIXME: STL headers are not allowed in public headers
|
#include <type_traits> // FIXME: STL headers are not allowed in public headers
|
||||||
@@ -27,6 +24,10 @@
|
|||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
struct HwBufferObject;
|
struct HwBufferObject;
|
||||||
|
|||||||
@@ -20,12 +20,14 @@
|
|||||||
#include <backend/DriverEnums.h>
|
#include <backend/DriverEnums.h>
|
||||||
#include <backend/Handle.h>
|
#include <backend/Handle.h>
|
||||||
|
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
//! \privatesection
|
//! \privatesection
|
||||||
|
|||||||
@@ -24,11 +24,14 @@
|
|||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -201,23 +204,15 @@ public:
|
|||||||
}, new T(std::forward<T>(functor))
|
}, new T(std::forward<T>(functor))
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
// --------------------------------------------------------------------------------------------
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Computes the size in bytes needed to fit an image of given dimensions and format
|
* Computes the size in bytes for a pixel of given dimensions and format
|
||||||
*
|
*
|
||||||
* @param format Format of the image pixels
|
* @param format Format of the image pixels
|
||||||
* @param type Type of the image pixels
|
* @param type Type of the image pixels
|
||||||
* @param stride Stride of a row in pixels
|
* @return The size of the specified pixel in bytes
|
||||||
* @param height Height of the image in rows
|
|
||||||
* @param alignment Alignment in bytes of pixel rows
|
|
||||||
* @return The buffer size needed to fit this image in bytes
|
|
||||||
*/
|
*/
|
||||||
static constexpr size_t computeDataSize(PixelDataFormat format, PixelDataType type,
|
|
||||||
size_t stride, size_t height, size_t alignment) noexcept {
|
|
||||||
assert_invariant(alignment);
|
|
||||||
|
|
||||||
|
static constexpr size_t computePixelSize(PixelDataFormat format, PixelDataType type) noexcept {
|
||||||
if (type == PixelDataType::COMPRESSED) {
|
if (type == PixelDataType::COMPRESSED) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
@@ -239,7 +234,7 @@ public:
|
|||||||
case PixelDataFormat::RGB_INTEGER:
|
case PixelDataFormat::RGB_INTEGER:
|
||||||
n = 3;
|
n = 3;
|
||||||
break;
|
break;
|
||||||
case PixelDataFormat::UNUSED: // shouldn't happen (used to be rgbm)
|
case PixelDataFormat::UNUSED:// shouldn't happen (used to be rgbm)
|
||||||
case PixelDataFormat::RGBA:
|
case PixelDataFormat::RGBA:
|
||||||
case PixelDataFormat::RGBA_INTEGER:
|
case PixelDataFormat::RGBA_INTEGER:
|
||||||
n = 4;
|
n = 4;
|
||||||
@@ -248,7 +243,7 @@ public:
|
|||||||
|
|
||||||
size_t bpp = n;
|
size_t bpp = n;
|
||||||
switch (type) {
|
switch (type) {
|
||||||
case PixelDataType::COMPRESSED: // Impossible -- to squash the IDE warnings
|
case PixelDataType::COMPRESSED:// Impossible -- to squash the IDE warnings
|
||||||
case PixelDataType::UBYTE:
|
case PixelDataType::UBYTE:
|
||||||
case PixelDataType::BYTE:
|
case PixelDataType::BYTE:
|
||||||
// nothing to do
|
// nothing to do
|
||||||
@@ -279,16 +274,35 @@ public:
|
|||||||
bpp = 2;
|
bpp = 2;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
return bpp;
|
||||||
|
}
|
||||||
|
|
||||||
|
// --------------------------------------------------------------------------------------------
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Computes the size in bytes needed to fit an image of given dimensions and format
|
||||||
|
*
|
||||||
|
* @param format Format of the image pixels
|
||||||
|
* @param type Type of the image pixels
|
||||||
|
* @param stride Stride of a row in pixels
|
||||||
|
* @param height Height of the image in rows
|
||||||
|
* @param alignment Alignment in bytes of pixel rows
|
||||||
|
* @return The buffer size needed to fit this image in bytes
|
||||||
|
*/
|
||||||
|
static constexpr size_t computeDataSize(PixelDataFormat format, PixelDataType type,
|
||||||
|
size_t stride, size_t height, size_t alignment) noexcept {
|
||||||
|
assert_invariant(alignment);
|
||||||
|
|
||||||
|
size_t bpp = computePixelSize(format, type);
|
||||||
size_t const bpr = bpp * stride;
|
size_t const bpr = bpp * stride;
|
||||||
size_t const bprAligned = (bpr + (alignment - 1)) & (~alignment + 1);
|
size_t const bprAligned = (bpr + (alignment - 1)) & (~alignment + 1);
|
||||||
return bprAligned * height;
|
return bprAligned * height;
|
||||||
}
|
}
|
||||||
|
|
||||||
//! left coordinate in pixels
|
//! left coordinate in pixels
|
||||||
uint32_t left = 0;
|
uint32_t left = 0;
|
||||||
//! top coordinate in pixels
|
//! top coordinate in pixels
|
||||||
uint32_t top = 0;
|
uint32_t top = 0;
|
||||||
union {
|
union {
|
||||||
struct {
|
struct {
|
||||||
//! stride in pixels
|
//! stride in pixels
|
||||||
|
|||||||
@@ -107,6 +107,36 @@ public:
|
|||||||
MULTIVIEW,
|
MULTIVIEW,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
/**
|
||||||
|
* This controls the priority level for GPU work scheduling, which helps prioritize the
|
||||||
|
* submitted GPU work and enables preemption.
|
||||||
|
*/
|
||||||
|
enum class GpuContextPriority : uint8_t {
|
||||||
|
/**
|
||||||
|
* Backend default GPU context priority (typically MEDIUM)
|
||||||
|
*/
|
||||||
|
DEFAULT,
|
||||||
|
/**
|
||||||
|
* For non-interactive, deferrable workloads. This should not interfere with standard
|
||||||
|
* applications.
|
||||||
|
*/
|
||||||
|
LOW,
|
||||||
|
/**
|
||||||
|
* The default priority level for standard applications.
|
||||||
|
*/
|
||||||
|
MEDIUM,
|
||||||
|
/**
|
||||||
|
* For high-priority, latency-sensitive workloads that are more important than standard
|
||||||
|
* applications.
|
||||||
|
*/
|
||||||
|
HIGH,
|
||||||
|
/**
|
||||||
|
* The highest priority, intended for system-critical, real-time applications where missing
|
||||||
|
* deadlines is unacceptable (e.g., VR/AR compositors or other system-critical tasks).
|
||||||
|
*/
|
||||||
|
REALTIME,
|
||||||
|
};
|
||||||
|
|
||||||
struct DriverConfig {
|
struct DriverConfig {
|
||||||
/**
|
/**
|
||||||
* Size of handle arena in bytes. Setting to 0 indicates default value is to be used.
|
* Size of handle arena in bytes. Setting to 0 indicates default value is to be used.
|
||||||
@@ -149,6 +179,20 @@ public:
|
|||||||
* - PlatformEGLAndroid
|
* - PlatformEGLAndroid
|
||||||
*/
|
*/
|
||||||
bool assertNativeWindowIsValid = false;
|
bool assertNativeWindowIsValid = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The action to take if a Drawable cannot be acquired. If true, the
|
||||||
|
* frame is aborted instead of panic. This is only supported for:
|
||||||
|
* - PlatformMetal
|
||||||
|
*/
|
||||||
|
bool metalDisablePanicOnDrawableFailure = false;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* GPU context priority level. Controls GPU work scheduling and preemption.
|
||||||
|
* This is only supported for:
|
||||||
|
* - PlatformEGL
|
||||||
|
*/
|
||||||
|
GpuContextPriority gpuContextPriority = GpuContextPriority::DEFAULT;
|
||||||
};
|
};
|
||||||
|
|
||||||
Platform() noexcept;
|
Platform() noexcept;
|
||||||
|
|||||||
@@ -20,12 +20,10 @@
|
|||||||
#include <utils/CString.h>
|
#include <utils/CString.h>
|
||||||
#include <utils/FixedCapacityVector.h>
|
#include <utils/FixedCapacityVector.h>
|
||||||
#include <utils/Invocable.h>
|
#include <utils/Invocable.h>
|
||||||
#include <utils/ostream.h>
|
|
||||||
|
|
||||||
#include <backend/DriverEnums.h>
|
#include <backend/DriverEnums.h>
|
||||||
|
|
||||||
#include <array>
|
#include <array>
|
||||||
#include <unordered_map>
|
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
#include <variant>
|
#include <variant>
|
||||||
@@ -33,6 +31,10 @@
|
|||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
class Program {
|
class Program {
|
||||||
@@ -44,8 +46,8 @@ public:
|
|||||||
|
|
||||||
struct Descriptor {
|
struct Descriptor {
|
||||||
utils::CString name;
|
utils::CString name;
|
||||||
backend::DescriptorType type;
|
DescriptorType type;
|
||||||
backend::descriptor_binding_t binding;
|
descriptor_binding_t binding;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct SpecializationConstant {
|
struct SpecializationConstant {
|
||||||
|
|||||||
@@ -19,22 +19,26 @@
|
|||||||
|
|
||||||
#include <backend/Handle.h>
|
#include <backend/Handle.h>
|
||||||
|
|
||||||
#include <utils/ostream.h>
|
#include <utility>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
|
namespace utils::io {
|
||||||
|
class ostream;
|
||||||
|
} // namespace utils::io
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
//! \privatesection
|
//! \privatesection
|
||||||
|
|
||||||
struct TargetBufferInfo {
|
struct TargetBufferInfo {
|
||||||
// note: the parameters of this constructor are not in the order of this structure's fields
|
// note: the parameters of this constructor are not in the order of this structure's fields
|
||||||
TargetBufferInfo(Handle<HwTexture> handle, uint8_t level, uint16_t layer) noexcept
|
TargetBufferInfo(Handle<HwTexture> handle, uint8_t const level, uint16_t const layer) noexcept
|
||||||
: handle(handle), level(level), layer(layer) {
|
: handle(std::move(handle)), level(level), layer(layer) {
|
||||||
}
|
}
|
||||||
|
|
||||||
TargetBufferInfo(Handle<HwTexture> handle, uint8_t level) noexcept
|
TargetBufferInfo(Handle<HwTexture> handle, uint8_t const level) noexcept
|
||||||
: handle(handle), level(level) {
|
: handle(handle), level(level) {
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -70,11 +74,11 @@ private:
|
|||||||
TargetBufferInfo mInfos[MAX_SUPPORTED_RENDER_TARGET_COUNT];
|
TargetBufferInfo mInfos[MAX_SUPPORTED_RENDER_TARGET_COUNT];
|
||||||
|
|
||||||
public:
|
public:
|
||||||
TargetBufferInfo const& operator[](size_t i) const noexcept {
|
TargetBufferInfo const& operator[](size_t const i) const noexcept {
|
||||||
return mInfos[i];
|
return mInfos[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
TargetBufferInfo& operator[](size_t i) noexcept {
|
TargetBufferInfo& operator[](size_t const i) noexcept {
|
||||||
return mInfos[i];
|
return mInfos[i];
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -199,7 +199,7 @@ public:
|
|||||||
*/
|
*/
|
||||||
virtual bool makeCurrent(ContextType type,
|
virtual bool makeCurrent(ContextType type,
|
||||||
SwapChain* UTILS_NONNULL drawSwapChain,
|
SwapChain* UTILS_NONNULL drawSwapChain,
|
||||||
SwapChain* UTILS_NONNULL readSwapChain) noexcept = 0;
|
SwapChain* UTILS_NONNULL readSwapChain) = 0;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called by the driver to make the OpenGL context active on the calling thread and bind
|
* Called by the driver to make the OpenGL context active on the calling thread and bind
|
||||||
@@ -219,7 +219,7 @@ public:
|
|||||||
SwapChain* UTILS_NONNULL drawSwapChain,
|
SwapChain* UTILS_NONNULL drawSwapChain,
|
||||||
SwapChain* UTILS_NONNULL readSwapChain,
|
SwapChain* UTILS_NONNULL readSwapChain,
|
||||||
utils::Invocable<void()> preContextChange,
|
utils::Invocable<void()> preContextChange,
|
||||||
utils::Invocable<void(size_t index)> postContextChange) noexcept;
|
utils::Invocable<void(size_t index)> postContextChange);
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Called by the backend just before calling commit()
|
* Called by the backend just before calling commit()
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ protected:
|
|||||||
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
ExternalTexture* createExternalImageTexture() noexcept override;
|
ExternalTexture* createExternalImageTexture() noexcept override;
|
||||||
void destroyExternalImageTexture(ExternalTexture* texture) noexcept override;
|
void destroyExternalImageTexture(ExternalTexture* texture) noexcept override;
|
||||||
|
|||||||
@@ -55,7 +55,7 @@ public:
|
|||||||
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
|
|
||||||
ExternalTexture* createExternalImageTexture() noexcept override;
|
ExternalTexture* createExternalImageTexture() noexcept override;
|
||||||
|
|||||||
@@ -109,11 +109,11 @@ protected:
|
|||||||
|
|
||||||
bool makeCurrent(ContextType type,
|
bool makeCurrent(ContextType type,
|
||||||
SwapChain* drawSwapChain,
|
SwapChain* drawSwapChain,
|
||||||
SwapChain* readSwapChain) noexcept override;
|
SwapChain* readSwapChain) override;
|
||||||
|
|
||||||
void makeCurrent(SwapChain* drawSwapChain, SwapChain* readSwapChain,
|
void makeCurrent(SwapChain* drawSwapChain, SwapChain* readSwapChain,
|
||||||
utils::Invocable<void()> preContextChange,
|
utils::Invocable<void()> preContextChange,
|
||||||
utils::Invocable<void(size_t index)> postContextChange) noexcept override;
|
utils::Invocable<void(size_t index)> postContextChange) override;
|
||||||
|
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
|
|
||||||
@@ -128,7 +128,7 @@ protected:
|
|||||||
bool setExternalImage(ExternalImageHandleRef externalImage, ExternalTexture* texture) noexcept override;
|
bool setExternalImage(ExternalImageHandleRef externalImage, ExternalTexture* texture) noexcept override;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Logs glGetError() to slog.e
|
* Logs glGetError() to LOG(ERROR)
|
||||||
* @param name a string giving some context on the error. Typically __func__.
|
* @param name a string giving some context on the error. Typically __func__.
|
||||||
*/
|
*/
|
||||||
static void logEglError(const char* name) noexcept;
|
static void logEglError(const char* name) noexcept;
|
||||||
@@ -148,12 +148,12 @@ protected:
|
|||||||
EGLContext getContextForType(ContextType type) const noexcept;
|
EGLContext getContextForType(ContextType type) const noexcept;
|
||||||
|
|
||||||
// makes the draw and read surface current without changing the current context
|
// makes the draw and read surface current without changing the current context
|
||||||
EGLBoolean makeCurrent(EGLSurface drawSurface, EGLSurface readSurface) noexcept {
|
EGLBoolean makeCurrent(EGLSurface drawSurface, EGLSurface readSurface) {
|
||||||
return egl.makeCurrent(drawSurface, readSurface);
|
return egl.makeCurrent(drawSurface, readSurface);
|
||||||
}
|
}
|
||||||
|
|
||||||
// makes context current and set draw and read surfaces to EGL_NO_SURFACE
|
// makes context current and set draw and read surfaces to EGL_NO_SURFACE
|
||||||
EGLBoolean makeCurrent(EGLContext context) noexcept {
|
EGLBoolean makeCurrent(EGLContext context) {
|
||||||
return egl.makeCurrent(context, mEGLDummySurface, mEGLDummySurface);
|
return egl.makeCurrent(context, mEGLDummySurface, mEGLDummySurface);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -211,9 +211,9 @@ private:
|
|||||||
public:
|
public:
|
||||||
explicit EGL(EGLDisplay& dpy) : mEGLDisplay(dpy) {}
|
explicit EGL(EGLDisplay& dpy) : mEGLDisplay(dpy) {}
|
||||||
EGLBoolean makeCurrent(EGLContext context,
|
EGLBoolean makeCurrent(EGLContext context,
|
||||||
EGLSurface drawSurface, EGLSurface readSurface) noexcept;
|
EGLSurface drawSurface, EGLSurface readSurface);
|
||||||
|
|
||||||
EGLBoolean makeCurrent(EGLSurface drawSurface, EGLSurface readSurface) noexcept {
|
EGLBoolean makeCurrent(EGLSurface drawSurface, EGLSurface readSurface) {
|
||||||
return makeCurrent(mCurrentContext, drawSurface, readSurface);
|
return makeCurrent(mCurrentContext, drawSurface, readSurface);
|
||||||
}
|
}
|
||||||
} egl{ mEGLDisplay };
|
} egl{ mEGLDisplay };
|
||||||
|
|||||||
@@ -127,7 +127,7 @@ protected:
|
|||||||
protected:
|
protected:
|
||||||
bool makeCurrent(ContextType type,
|
bool makeCurrent(ContextType type,
|
||||||
SwapChain* drawSwapChain,
|
SwapChain* drawSwapChain,
|
||||||
SwapChain* readSwapChain) noexcept override;
|
SwapChain* readSwapChain) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
struct InitializeJvmForPerformanceManagerIfNeeded {
|
struct InitializeJvmForPerformanceManagerIfNeeded {
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ protected:
|
|||||||
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -39,18 +39,40 @@ public:
|
|||||||
Driver* createDriver(void* sharedContext, const Platform::DriverConfig& driverConfig) noexcept override;
|
Driver* createDriver(void* sharedContext, const Platform::DriverConfig& driverConfig) noexcept override;
|
||||||
int getOSVersion() const noexcept override { return 0; }
|
int getOSVersion() const noexcept override { return 0; }
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Optionally initializes the Metal platform by acquiring resources necessary for rendering.
|
||||||
|
*
|
||||||
|
* This method attempts to acquire a Metal device and command queue, returning true if both are
|
||||||
|
* successfully obtained, or false otherwise. Typically, these objects are acquired when
|
||||||
|
* the Metal backend is initialized. This method allows clients to check for their availability
|
||||||
|
* earlier.
|
||||||
|
*
|
||||||
|
* Calling initialize() is optional and safe to do so multiple times. After initialize() returns
|
||||||
|
* true, subsequent calls will continue to return true but have no effect.
|
||||||
|
*
|
||||||
|
* initialize() must be called from the main thread.
|
||||||
|
*
|
||||||
|
* @returns true if the device and command queue have been successfully obtained; false
|
||||||
|
* otherwise.
|
||||||
|
*/
|
||||||
|
bool initialize() noexcept;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Obtain the preferred Metal device object for the backend to use.
|
* Obtain the preferred Metal device object for the backend to use.
|
||||||
*
|
*
|
||||||
* On desktop platforms, there may be multiple GPUs suitable for rendering, and this method is
|
* On desktop platforms, there may be multiple GPUs suitable for rendering, and this method is
|
||||||
* free to decide which one to use. On mobile systems with a single GPU, implementations should
|
* free to decide which one to use. On mobile systems with a single GPU, implementations should
|
||||||
* simply return the result of MTLCreateSystemDefaultDevice();
|
* simply return the result of MTLCreateSystemDefaultDevice();
|
||||||
|
*
|
||||||
|
* createDevice is called by the Metal backend from the backend thread.
|
||||||
*/
|
*/
|
||||||
virtual void createDevice(MetalDevice& outDevice) noexcept;
|
virtual void createDevice(MetalDevice& outDevice) noexcept;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Create a command submission queue on the Metal device object.
|
* Create a command submission queue on the Metal device object.
|
||||||
*
|
*
|
||||||
|
* createCommandQueue is called by the Metal backend from the backend thread.
|
||||||
|
*
|
||||||
* @param device The device which was returned from createDevice()
|
* @param device The device which was returned from createDevice()
|
||||||
*/
|
*/
|
||||||
virtual void createCommandQueue(
|
virtual void createCommandQueue(
|
||||||
@@ -60,6 +82,8 @@ public:
|
|||||||
* Obtain a MTLCommandBuffer enqueued on this Platform's MTLCommandQueue. The command buffer is
|
* Obtain a MTLCommandBuffer enqueued on this Platform's MTLCommandQueue. The command buffer is
|
||||||
* guaranteed to execute before all subsequent command buffers created either by Filament, or
|
* guaranteed to execute before all subsequent command buffers created either by Filament, or
|
||||||
* further calls to this method.
|
* further calls to this method.
|
||||||
|
*
|
||||||
|
* createAndEnqueueCommandBuffer must be called from the main thread.
|
||||||
*/
|
*/
|
||||||
void createAndEnqueueCommandBuffer(MetalCommandBuffer& outCommandBuffer) noexcept;
|
void createAndEnqueueCommandBuffer(MetalCommandBuffer& outCommandBuffer) noexcept;
|
||||||
|
|
||||||
@@ -68,6 +92,8 @@ public:
|
|||||||
*
|
*
|
||||||
* Each frame rendered requires a CAMetalDrawable texture, which is presented on-screen at the
|
* Each frame rendered requires a CAMetalDrawable texture, which is presented on-screen at the
|
||||||
* completion of each frame. These are limited and provided round-robin style by the system.
|
* completion of each frame. These are limited and provided round-robin style by the system.
|
||||||
|
*
|
||||||
|
* setDrawableFailureBehavior must be called from the main thread.
|
||||||
*/
|
*/
|
||||||
enum class DrawableFailureBehavior : uint8_t {
|
enum class DrawableFailureBehavior : uint8_t {
|
||||||
/**
|
/**
|
||||||
|
|||||||
@@ -56,7 +56,7 @@ protected:
|
|||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain,
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain,
|
||||||
SwapChain* readSwapChain) noexcept override;
|
SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|||||||
@@ -53,7 +53,7 @@ protected:
|
|||||||
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -46,7 +46,7 @@ protected:
|
|||||||
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(void* nativewindow, uint64_t flags) noexcept override;
|
||||||
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
SwapChain* createSwapChain(uint32_t width, uint32_t height, uint64_t flags) noexcept override;
|
||||||
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
void destroySwapChain(SwapChain* swapChain) noexcept override;
|
||||||
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) noexcept override;
|
bool makeCurrent(ContextType type, SwapChain* drawSwapChain, SwapChain* readSwapChain) override;
|
||||||
void commit(SwapChain* swapChain) noexcept override;
|
void commit(SwapChain* swapChain) noexcept override;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -27,8 +27,11 @@
|
|||||||
#include <utils/Hash.h>
|
#include <utils/Hash.h>
|
||||||
#include <utils/PrivateImplementation.h>
|
#include <utils/PrivateImplementation.h>
|
||||||
|
|
||||||
|
#include <cstddef>
|
||||||
|
#include <functional>
|
||||||
#include <tuple>
|
#include <tuple>
|
||||||
#include <unordered_set>
|
#include <unordered_set>
|
||||||
|
#include <string>
|
||||||
|
|
||||||
#include <stddef.h>
|
#include <stddef.h>
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|||||||
@@ -22,6 +22,7 @@
|
|||||||
#include <webgpu/webgpu_cpp.h>
|
#include <webgpu/webgpu_cpp.h>
|
||||||
|
|
||||||
#include <cstdint>
|
#include <cstdint>
|
||||||
|
#include <vector>
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
@@ -56,6 +57,10 @@ protected:
|
|||||||
const Platform::DriverConfig& driverConfig) noexcept override;
|
const Platform::DriverConfig& driverConfig) noexcept override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
// returns adapter request option variations applicable for the particular
|
||||||
|
// platform
|
||||||
|
[[nodiscard]] static std::vector<wgpu::RequestAdapterOptions> getAdapterOptions();
|
||||||
|
|
||||||
// we may consider having the driver own this in the future
|
// we may consider having the driver own this in the future
|
||||||
wgpu::Instance mInstance;
|
wgpu::Instance mInstance;
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -72,7 +72,7 @@ public:
|
|||||||
Range getBuffer() noexcept;
|
Range getBuffer() noexcept;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void* alloc(size_t size) noexcept;
|
void* alloc(size_t size);
|
||||||
void dealloc() noexcept;
|
void dealloc() noexcept;
|
||||||
|
|
||||||
// pointer to the beginning of the circular buffer (constant)
|
// pointer to the beginning of the circular buffer (constant)
|
||||||
|
|||||||
@@ -76,7 +76,7 @@ public:
|
|||||||
|
|
||||||
// all commands buffers (Slices) written to this point are returned by waitForCommand(). This
|
// all commands buffers (Slices) written to this point are returned by waitForCommand(). This
|
||||||
// call blocks until the CircularBuffer has at least mRequiredSize bytes available.
|
// call blocks until the CircularBuffer has at least mRequiredSize bytes available.
|
||||||
void flush() noexcept;
|
void flush();
|
||||||
|
|
||||||
// returns from waitForCommands() immediately.
|
// returns from waitForCommands() immediately.
|
||||||
void requestExit();
|
void requestExit();
|
||||||
|
|||||||
@@ -39,7 +39,7 @@
|
|||||||
#define FILAMENT_DEBUG_COMMANDS_NONE 0x0
|
#define FILAMENT_DEBUG_COMMANDS_NONE 0x0
|
||||||
// Command debugging enabled. No logging by default.
|
// Command debugging enabled. No logging by default.
|
||||||
#define FILAMENT_DEBUG_COMMANDS_ENABLE 0x1
|
#define FILAMENT_DEBUG_COMMANDS_ENABLE 0x1
|
||||||
// Command debugging enabled. Every command logged to slog.d
|
// Command debugging enabled. Every command logged to DLOG(INFO)
|
||||||
#define FILAMENT_DEBUG_COMMANDS_LOG 0x2
|
#define FILAMENT_DEBUG_COMMANDS_LOG 0x2
|
||||||
// Command debugging enabled. Every command logged to systrace
|
// Command debugging enabled. Every command logged to systrace
|
||||||
#define FILAMENT_DEBUG_COMMANDS_SYSTRACE 0x4
|
#define FILAMENT_DEBUG_COMMANDS_SYSTRACE 0x4
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ public:
|
|||||||
* Destroys the object D at Handle<B> and construct a new D in its place
|
* Destroys the object D at Handle<B> and construct a new D in its place
|
||||||
* e.g.:
|
* e.g.:
|
||||||
* Handle<ConcreteTexture> h = allocateAndConstruct(w, h);
|
* Handle<ConcreteTexture> h = allocateAndConstruct(w, h);
|
||||||
* ConcreteTexture* p = reconstruct(h, w, h);
|
* ConcreteTexture* p = destroyAndConstruct(h, w, h);
|
||||||
*/
|
*/
|
||||||
template<typename D, typename B, typename ... ARGS>
|
template<typename D, typename B, typename ... ARGS>
|
||||||
std::enable_if_t<std::is_base_of_v<B, D>, D>*
|
std::enable_if_t<std::is_base_of_v<B, D>, D>*
|
||||||
|
|||||||
@@ -27,13 +27,13 @@ namespace filament {
|
|||||||
class VirtualMachineEnv {
|
class VirtualMachineEnv {
|
||||||
public:
|
public:
|
||||||
// must be called before VirtualMachineEnv::get() from a thread that is attached to the JavaVM
|
// must be called before VirtualMachineEnv::get() from a thread that is attached to the JavaVM
|
||||||
static jint JNI_OnLoad(JavaVM* vm) noexcept;
|
static jint JNI_OnLoad(JavaVM* vm);
|
||||||
|
|
||||||
// must be called on backend thread
|
// must be called on backend thread
|
||||||
static VirtualMachineEnv& get() noexcept;
|
static VirtualMachineEnv& get() noexcept;
|
||||||
|
|
||||||
// can be called from any thread that already has a JniEnv
|
// can be called from any thread that already has a JniEnv
|
||||||
static JNIEnv* getThreadEnvironment() noexcept;
|
static JNIEnv* getThreadEnvironment();
|
||||||
|
|
||||||
// must be called from the backend thread
|
// must be called from the backend thread
|
||||||
JNIEnv* getEnvironment() noexcept {
|
JNIEnv* getEnvironment() noexcept {
|
||||||
@@ -49,7 +49,7 @@ public:
|
|||||||
private:
|
private:
|
||||||
explicit VirtualMachineEnv(JavaVM* vm) noexcept;
|
explicit VirtualMachineEnv(JavaVM* vm) noexcept;
|
||||||
~VirtualMachineEnv() noexcept;
|
~VirtualMachineEnv() noexcept;
|
||||||
JNIEnv* getEnvironmentSlow() noexcept;
|
JNIEnv* getEnvironmentSlow();
|
||||||
|
|
||||||
static utils::Mutex sLock;
|
static utils::Mutex sLock;
|
||||||
static JavaVM* sVirtualMachine;
|
static JavaVM* sVirtualMachine;
|
||||||
|
|||||||
@@ -18,6 +18,8 @@
|
|||||||
|
|
||||||
#include "DataReshaper.h"
|
#include "DataReshaper.h"
|
||||||
|
|
||||||
|
#include <backend/DriverEnums.h>
|
||||||
|
|
||||||
#include <utils/CString.h>
|
#include <utils/CString.h>
|
||||||
|
|
||||||
#include <string_view>
|
#include <string_view>
|
||||||
@@ -223,6 +225,143 @@ size_t getFormatSize(TextureFormat format) noexcept {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TextureType getTextureType(TextureFormat const format) noexcept {
|
||||||
|
switch (format) {
|
||||||
|
case TextureFormat::UNUSED:
|
||||||
|
// should not happen
|
||||||
|
return TextureType::FLOAT;
|
||||||
|
|
||||||
|
case TextureFormat::R8:
|
||||||
|
case TextureFormat::R16F:
|
||||||
|
case TextureFormat::RG8:
|
||||||
|
case TextureFormat::RGB565:
|
||||||
|
case TextureFormat::RGB5_A1:
|
||||||
|
case TextureFormat::RGBA4:
|
||||||
|
case TextureFormat::R32F:
|
||||||
|
case TextureFormat::RGB8:
|
||||||
|
case TextureFormat::SRGB8:
|
||||||
|
case TextureFormat::RG16F:
|
||||||
|
case TextureFormat::R11F_G11F_B10F:
|
||||||
|
case TextureFormat::RGB9_E5:
|
||||||
|
case TextureFormat::RGBA8:
|
||||||
|
case TextureFormat::SRGB8_A8:
|
||||||
|
case TextureFormat::RGB10_A2:
|
||||||
|
case TextureFormat::RGB16F:
|
||||||
|
case TextureFormat::RG32F:
|
||||||
|
case TextureFormat::RGBA16F:
|
||||||
|
case TextureFormat::RGB32F:
|
||||||
|
case TextureFormat::RGBA32F:
|
||||||
|
return TextureType::FLOAT;
|
||||||
|
|
||||||
|
case TextureFormat::R8_SNORM:
|
||||||
|
case TextureFormat::RG8_SNORM:
|
||||||
|
case TextureFormat::RGB8_SNORM:
|
||||||
|
case TextureFormat::RGBA8_SNORM:
|
||||||
|
// SNORM are treated as float
|
||||||
|
return TextureType::FLOAT;
|
||||||
|
|
||||||
|
case TextureFormat::R8UI:
|
||||||
|
case TextureFormat::R16UI:
|
||||||
|
case TextureFormat::RG8UI:
|
||||||
|
case TextureFormat::RGB8UI:
|
||||||
|
case TextureFormat::R32UI:
|
||||||
|
case TextureFormat::RG16UI:
|
||||||
|
case TextureFormat::RGBA8UI:
|
||||||
|
case TextureFormat::RGB16UI:
|
||||||
|
case TextureFormat::RG32UI:
|
||||||
|
case TextureFormat::RGBA16UI:
|
||||||
|
case TextureFormat::RGB32UI:
|
||||||
|
case TextureFormat::RGBA32UI:
|
||||||
|
return TextureType::UINT;
|
||||||
|
|
||||||
|
case TextureFormat::R8I:
|
||||||
|
case TextureFormat::R16I:
|
||||||
|
case TextureFormat::RG8I:
|
||||||
|
case TextureFormat::RGB8I:
|
||||||
|
case TextureFormat::R32I:
|
||||||
|
case TextureFormat::RG16I:
|
||||||
|
case TextureFormat::RGBA8I:
|
||||||
|
case TextureFormat::RGB16I:
|
||||||
|
case TextureFormat::RG32I:
|
||||||
|
case TextureFormat::RGBA16I:
|
||||||
|
case TextureFormat::RGB32I:
|
||||||
|
case TextureFormat::RGBA32I:
|
||||||
|
return TextureType::INT;
|
||||||
|
|
||||||
|
case TextureFormat::DEPTH16:
|
||||||
|
case TextureFormat::DEPTH24:
|
||||||
|
case TextureFormat::DEPTH32F:
|
||||||
|
return TextureType::DEPTH;
|
||||||
|
|
||||||
|
case TextureFormat::STENCIL8:
|
||||||
|
return TextureType::STENCIL;
|
||||||
|
|
||||||
|
case TextureFormat::DEPTH24_STENCIL8:
|
||||||
|
case TextureFormat::DEPTH32F_STENCIL8:
|
||||||
|
return TextureType::DEPTH_STENCIL;
|
||||||
|
|
||||||
|
// Compressed formats ---------------------------------------------------------------------
|
||||||
|
|
||||||
|
case TextureFormat::EAC_RG11:
|
||||||
|
case TextureFormat::EAC_RG11_SIGNED:
|
||||||
|
case TextureFormat::ETC2_EAC_RGBA8:
|
||||||
|
case TextureFormat::ETC2_EAC_SRGBA8:
|
||||||
|
case TextureFormat::EAC_R11:
|
||||||
|
case TextureFormat::EAC_R11_SIGNED:
|
||||||
|
case TextureFormat::ETC2_RGB8:
|
||||||
|
case TextureFormat::ETC2_SRGB8:
|
||||||
|
case TextureFormat::ETC2_RGB8_A1:
|
||||||
|
case TextureFormat::ETC2_SRGB8_A1:
|
||||||
|
case TextureFormat::DXT1_RGB:
|
||||||
|
case TextureFormat::DXT1_RGBA:
|
||||||
|
case TextureFormat::DXT1_SRGB:
|
||||||
|
case TextureFormat::DXT1_SRGBA:
|
||||||
|
case TextureFormat::DXT3_RGBA:
|
||||||
|
case TextureFormat::DXT3_SRGBA:
|
||||||
|
case TextureFormat::DXT5_RGBA:
|
||||||
|
case TextureFormat::DXT5_SRGBA:
|
||||||
|
case TextureFormat::RED_RGTC1:
|
||||||
|
case TextureFormat::SIGNED_RED_RGTC1:
|
||||||
|
case TextureFormat::RED_GREEN_RGTC2:
|
||||||
|
case TextureFormat::SIGNED_RED_GREEN_RGTC2:
|
||||||
|
case TextureFormat::RGB_BPTC_SIGNED_FLOAT:
|
||||||
|
case TextureFormat::RGB_BPTC_UNSIGNED_FLOAT:
|
||||||
|
case TextureFormat::RGBA_BPTC_UNORM:
|
||||||
|
case TextureFormat::SRGB_ALPHA_BPTC_UNORM:
|
||||||
|
case TextureFormat::RGBA_ASTC_4x4:
|
||||||
|
case TextureFormat::RGBA_ASTC_5x4:
|
||||||
|
case TextureFormat::RGBA_ASTC_5x5:
|
||||||
|
case TextureFormat::RGBA_ASTC_6x5:
|
||||||
|
case TextureFormat::RGBA_ASTC_6x6:
|
||||||
|
case TextureFormat::RGBA_ASTC_8x5:
|
||||||
|
case TextureFormat::RGBA_ASTC_8x6:
|
||||||
|
case TextureFormat::RGBA_ASTC_8x8:
|
||||||
|
case TextureFormat::RGBA_ASTC_10x5:
|
||||||
|
case TextureFormat::RGBA_ASTC_10x6:
|
||||||
|
case TextureFormat::RGBA_ASTC_10x8:
|
||||||
|
case TextureFormat::RGBA_ASTC_10x10:
|
||||||
|
case TextureFormat::RGBA_ASTC_12x10:
|
||||||
|
case TextureFormat::RGBA_ASTC_12x12:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_4x4:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_5x4:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_5x5:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_6x5:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_6x6:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_8x5:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_8x6:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_8x8:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_10x5:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_10x6:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_10x8:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_10x10:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_12x10:
|
||||||
|
case TextureFormat::SRGB8_ALPHA8_ASTC_12x12:
|
||||||
|
return TextureType::FLOAT;
|
||||||
|
}
|
||||||
|
|
||||||
|
return TextureType::FLOAT;
|
||||||
|
}
|
||||||
|
|
||||||
size_t getFormatComponentCount(TextureFormat format) noexcept {
|
size_t getFormatComponentCount(TextureFormat format) noexcept {
|
||||||
switch (format) {
|
switch (format) {
|
||||||
case TextureFormat::R8:
|
case TextureFormat::R8:
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include "private/backend/CircularBuffer.h"
|
#include "private/backend/CircularBuffer.h"
|
||||||
|
|
||||||
#include <utils/Log.h>
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/architecture.h>
|
#include <utils/architecture.h>
|
||||||
#include <utils/ashmem.h>
|
#include <utils/ashmem.h>
|
||||||
@@ -65,7 +65,7 @@ CircularBuffer::~CircularBuffer() noexcept {
|
|||||||
// to each others and a special case in circularize()
|
// to each others and a special case in circularize()
|
||||||
|
|
||||||
UTILS_NOINLINE
|
UTILS_NOINLINE
|
||||||
void* CircularBuffer::alloc(size_t size) noexcept {
|
void* CircularBuffer::alloc(size_t size) {
|
||||||
#if HAS_MMAP
|
#if HAS_MMAP
|
||||||
void* data = nullptr;
|
void* data = nullptr;
|
||||||
void* vaddr = MAP_FAILED;
|
void* vaddr = MAP_FAILED;
|
||||||
@@ -127,7 +127,7 @@ void* CircularBuffer::alloc(size_t size) noexcept {
|
|||||||
"couldn't allocate " << (size * 2 / 1024) <<
|
"couldn't allocate " << (size * 2 / 1024) <<
|
||||||
" KiB of virtual address space for the command buffer";
|
" KiB of virtual address space for the command buffer";
|
||||||
|
|
||||||
slog.w << "Using 'soft' CircularBuffer (" << (size * 2 / 1024) << " KiB)" << io::endl;
|
LOG(WARNING) << "Using 'soft' CircularBuffer (" << (size * 2 / 1024) << " KiB)";
|
||||||
|
|
||||||
// guard page at the end
|
// guard page at the end
|
||||||
void* guard = (void*)(uintptr_t(data) + size * 2);
|
void* guard = (void*)(uintptr_t(data) + size * 2);
|
||||||
|
|||||||
@@ -18,13 +18,14 @@
|
|||||||
#include "private/backend/CircularBuffer.h"
|
#include "private/backend/CircularBuffer.h"
|
||||||
#include "private/backend/CommandStream.h"
|
#include "private/backend/CommandStream.h"
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <private/utils/Tracing.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Mutex.h>
|
#include <utils/Mutex.h>
|
||||||
#include <utils/ostream.h>
|
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/Systrace.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
|
#include <utils/ostream.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <mutex>
|
#include <mutex>
|
||||||
@@ -52,18 +53,18 @@ CommandBufferQueue::~CommandBufferQueue() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CommandBufferQueue::requestExit() {
|
void CommandBufferQueue::requestExit() {
|
||||||
std::lock_guard<utils::Mutex> const lock(mLock);
|
std::lock_guard const lock(mLock);
|
||||||
mExitRequested = EXIT_REQUESTED;
|
mExitRequested = EXIT_REQUESTED;
|
||||||
mCondition.notify_one();
|
mCondition.notify_one();
|
||||||
}
|
}
|
||||||
|
|
||||||
bool CommandBufferQueue::isPaused() const noexcept {
|
bool CommandBufferQueue::isPaused() const noexcept {
|
||||||
std::lock_guard<utils::Mutex> const lock(mLock);
|
std::lock_guard const lock(mLock);
|
||||||
return mPaused;
|
return mPaused;
|
||||||
}
|
}
|
||||||
|
|
||||||
void CommandBufferQueue::setPaused(bool paused) {
|
void CommandBufferQueue::setPaused(bool paused) {
|
||||||
std::lock_guard<utils::Mutex> const lock(mLock);
|
std::lock_guard const lock(mLock);
|
||||||
if (paused) {
|
if (paused) {
|
||||||
mPaused = true;
|
mPaused = true;
|
||||||
} else {
|
} else {
|
||||||
@@ -73,13 +74,13 @@ void CommandBufferQueue::setPaused(bool paused) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool CommandBufferQueue::isExitRequested() const {
|
bool CommandBufferQueue::isExitRequested() const {
|
||||||
std::lock_guard<utils::Mutex> const lock(mLock);
|
std::lock_guard const lock(mLock);
|
||||||
return (bool)mExitRequested;
|
return bool(mExitRequested);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void CommandBufferQueue::flush() noexcept {
|
void CommandBufferQueue::flush() {
|
||||||
SYSTRACE_CALL();
|
FILAMENT_TRACING_CALL(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
|
|
||||||
CircularBuffer& circularBuffer = mCircularBuffer;
|
CircularBuffer& circularBuffer = mCircularBuffer;
|
||||||
if (circularBuffer.empty()) {
|
if (circularBuffer.empty()) {
|
||||||
@@ -102,7 +103,7 @@ void CommandBufferQueue::flush() noexcept {
|
|||||||
static_cast<char const*>(begin), static_cast<char const*>(end));
|
static_cast<char const*>(begin), static_cast<char const*>(end));
|
||||||
|
|
||||||
|
|
||||||
std::unique_lock<utils::Mutex> lock(mLock);
|
std::unique_lock lock(mLock);
|
||||||
|
|
||||||
// circular buffer is too small, we corrupted the stream
|
// circular buffer is too small, we corrupted the stream
|
||||||
FILAMENT_CHECK_POSTCONDITION(used <= mFreeSpace) <<
|
FILAMENT_CHECK_POSTCONDITION(used <= mFreeSpace) <<
|
||||||
@@ -120,16 +121,15 @@ void CommandBufferQueue::flush() noexcept {
|
|||||||
|
|
||||||
#ifndef NDEBUG
|
#ifndef NDEBUG
|
||||||
size_t const totalUsed = circularBuffer.size() - mFreeSpace;
|
size_t const totalUsed = circularBuffer.size() - mFreeSpace;
|
||||||
slog.d << "CommandStream used too much space (will block): "
|
DLOG(INFO) << "CommandStream used too much space (will block): "
|
||||||
<< "needed space " << requiredSize << " out of " << mFreeSpace
|
<< "needed space " << requiredSize << " out of " << mFreeSpace
|
||||||
<< ", totalUsed=" << totalUsed << ", current=" << used
|
<< ", totalUsed=" << totalUsed << ", current=" << used
|
||||||
<< ", queue size=" << mCommandBuffersToExecute.size() << " buffers"
|
<< ", queue size=" << mCommandBuffersToExecute.size() << " buffers";
|
||||||
<< io::endl;
|
|
||||||
|
|
||||||
mHighWatermark = std::max(mHighWatermark, totalUsed);
|
mHighWatermark = std::max(mHighWatermark, totalUsed);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
SYSTRACE_NAME("waiting: CircularBuffer::flush()");
|
FILAMENT_TRACING_NAME(FILAMENT_TRACING_CATEGORY_FILAMENT, "waiting: CircularBuffer::flush()");
|
||||||
|
|
||||||
FILAMENT_CHECK_POSTCONDITION(!mPaused) <<
|
FILAMENT_CHECK_POSTCONDITION(!mPaused) <<
|
||||||
"CommandStream is full, but since the rendering thread is paused, "
|
"CommandStream is full, but since the rendering thread is paused, "
|
||||||
@@ -146,7 +146,7 @@ std::vector<CommandBufferQueue::Range> CommandBufferQueue::waitForCommands() con
|
|||||||
if (!UTILS_HAS_THREADING) {
|
if (!UTILS_HAS_THREADING) {
|
||||||
return std::move(mCommandBuffersToExecute);
|
return std::move(mCommandBuffersToExecute);
|
||||||
}
|
}
|
||||||
std::unique_lock<utils::Mutex> lock(mLock);
|
std::unique_lock lock(mLock);
|
||||||
while ((mCommandBuffersToExecute.empty() || mPaused) && !mExitRequested) {
|
while ((mCommandBuffersToExecute.empty() || mPaused) && !mExitRequested) {
|
||||||
mCondition.wait(lock);
|
mCondition.wait(lock);
|
||||||
}
|
}
|
||||||
@@ -156,7 +156,7 @@ std::vector<CommandBufferQueue::Range> CommandBufferQueue::waitForCommands() con
|
|||||||
void CommandBufferQueue::releaseBuffer(CommandBufferQueue::Range const& buffer) {
|
void CommandBufferQueue::releaseBuffer(CommandBufferQueue::Range const& buffer) {
|
||||||
size_t const used = std::distance(
|
size_t const used = std::distance(
|
||||||
static_cast<char const*>(buffer.begin), static_cast<char const*>(buffer.end));
|
static_cast<char const*>(buffer.begin), static_cast<char const*>(buffer.end));
|
||||||
std::lock_guard<utils::Mutex> const lock(mLock);
|
std::lock_guard const lock(mLock);
|
||||||
mFreeSpace += used;
|
mFreeSpace += used;
|
||||||
mCondition.notify_one();
|
mCondition.notify_one();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -16,15 +16,19 @@
|
|||||||
|
|
||||||
#include "private/backend/CommandStream.h"
|
#include "private/backend/CommandStream.h"
|
||||||
|
|
||||||
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
#if DEBUG_COMMAND_STREAM
|
#if DEBUG_COMMAND_STREAM
|
||||||
#include <utils/CallStack.h>
|
#include <utils/CallStack.h>
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <private/utils/Tracing.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
#include <utils/ostream.h>
|
#include <utils/Logger.h>
|
||||||
#include <utils/Profiler.h>
|
#include <utils/Profiler.h>
|
||||||
#include <utils/Systrace.h>
|
#include <utils/compiler.h>
|
||||||
|
#include <utils/ostream.h>
|
||||||
|
#include <utils/sstream.h>
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
#include <functional>
|
#include <functional>
|
||||||
@@ -79,12 +83,13 @@ CommandStream::CommandStream(Driver& driver, CircularBuffer& buffer) noexcept
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CommandStream::execute(void* buffer) {
|
void CommandStream::execute(void* buffer) {
|
||||||
// NOTE: we can't use SYSTRACE_CALL() or similar here because, execute() below, also
|
// NOTE: we can't use FILAMENT_TRACING_CALL() or similar here because, execute() below, also
|
||||||
// uses systrace BEGIN/END and the END is not guaranteed to be happening in this scope.
|
// uses systrace BEGIN/END and the END is not guaranteed to be happening in this scope.
|
||||||
|
|
||||||
Profiler profiler;
|
Profiler profiler;
|
||||||
|
|
||||||
if constexpr (SYSTRACE_TAG) {
|
|
||||||
|
if constexpr (FILAMENT_TRACING_ENABLED) {
|
||||||
if (UTILS_UNLIKELY(mUsePerformanceCounter)) {
|
if (UTILS_UNLIKELY(mUsePerformanceCounter)) {
|
||||||
// we want to remove all this when tracing is completely disabled
|
// we want to remove all this when tracing is completely disabled
|
||||||
profiler.resetEvents(Profiler::EV_CPU_CYCLES | Profiler::EV_BPU_MISSES);
|
profiler.resetEvents(Profiler::EV_CPU_CYCLES | Profiler::EV_BPU_MISSES);
|
||||||
@@ -100,17 +105,17 @@ void CommandStream::execute(void* buffer) {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
if constexpr (SYSTRACE_TAG) {
|
if constexpr (FILAMENT_TRACING_ENABLED) {
|
||||||
if (UTILS_UNLIKELY(mUsePerformanceCounter)) {
|
if (UTILS_UNLIKELY(mUsePerformanceCounter)) {
|
||||||
// we want to remove all this when tracing is completely disabled
|
// we want to remove all this when tracing is completely disabled
|
||||||
profiler.stop();
|
profiler.stop();
|
||||||
UTILS_UNUSED Profiler::Counters const counters = profiler.readCounters();
|
UTILS_UNUSED Profiler::Counters const counters = profiler.readCounters();
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
SYSTRACE_VALUE32("GLThread (I)", counters.getInstructions());
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "GLThread (I)", counters.getInstructions());
|
||||||
SYSTRACE_VALUE32("GLThread (C)", counters.getCpuCycles());
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "GLThread (C)", counters.getCpuCycles());
|
||||||
SYSTRACE_VALUE32("GLThread (CPI x10)", counters.getCPI() * 10);
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "GLThread (CPI x10)", counters.getCPI() * 10);
|
||||||
SYSTRACE_VALUE32("GLThread (BPU miss)", counters.getBranchMisses());
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "GLThread (BPU miss)", counters.getBranchMisses());
|
||||||
SYSTRACE_VALUE32("GLThread (I / BPU miss)",
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "GLThread (I / BPU miss)",
|
||||||
counters.getInstructions() / counters.getBranchMisses());
|
counters.getInstructions() / counters.getBranchMisses());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -127,9 +132,10 @@ void CommandType<void (Driver::*)(ARGS...)>::Command<METHOD>::log(std::index_seq
|
|||||||
#if DEBUG_COMMAND_STREAM
|
#if DEBUG_COMMAND_STREAM
|
||||||
static_assert(UTILS_HAS_RTTI, "DEBUG_COMMAND_STREAM can only be used with RTTI");
|
static_assert(UTILS_HAS_RTTI, "DEBUG_COMMAND_STREAM can only be used with RTTI");
|
||||||
std::string command = utils::CallStack::demangleTypeName(typeid(Command).name()).c_str();
|
std::string command = utils::CallStack::demangleTypeName(typeid(Command).name()).c_str();
|
||||||
slog.d << extractMethodName(command) << " : size=" << sizeof(Command) << "\n\t";
|
DLOG(INFO) << extractMethodName(command) << " : size=" << sizeof(Command);
|
||||||
printParameterPack(slog.d, std::get<I>(mArgs)...);
|
utils::io::sstream parameterPack;
|
||||||
slog.d << io::endl;
|
printParameterPack(parameterPack, std::get<I>(mArgs)...);
|
||||||
|
DLOG(INFO) << "\t" << parameterPack.c_str();
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,8 +20,9 @@
|
|||||||
#include "private/backend/Driver.h"
|
#include "private/backend/Driver.h"
|
||||||
#include "private/backend/CommandStream.h"
|
#include "private/backend/CommandStream.h"
|
||||||
|
|
||||||
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/Systrace.h>
|
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
@@ -38,7 +39,7 @@
|
|||||||
#if DEBUG_LEVEL == DEBUG_LEVEL_NONE
|
#if DEBUG_LEVEL == DEBUG_LEVEL_NONE
|
||||||
# define SYSTRACE()
|
# define SYSTRACE()
|
||||||
#elif DEBUG_LEVEL == DEBUG_LEVEL_SYSTRACE
|
#elif DEBUG_LEVEL == DEBUG_LEVEL_SYSTRACE
|
||||||
# define SYSTRACE() SYSTRACE_CALL();
|
# define SYSTRACE() FILAMENT_TRACING_CALL(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
#else
|
#else
|
||||||
# error "invalid debug level"
|
# error "invalid debug level"
|
||||||
#endif
|
#endif
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
|
|
||||||
#include "CompilerThreadPool.h"
|
#include "CompilerThreadPool.h"
|
||||||
|
|
||||||
#include <utils/Systrace.h>
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
#include <memory>
|
#include <memory>
|
||||||
|
|
||||||
@@ -41,7 +41,7 @@ void CompilerThreadPool::init(uint32_t threadCount,
|
|||||||
|
|
||||||
for (size_t i = 0; i < threadCount; i++) {
|
for (size_t i = 0; i < threadCount; i++) {
|
||||||
mCompilerThreads.emplace_back([this, setup, cleanup]() {
|
mCompilerThreads.emplace_back([this, setup, cleanup]() {
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
|
|
||||||
(*setup)();
|
(*setup)();
|
||||||
|
|
||||||
@@ -54,7 +54,7 @@ void CompilerThreadPool::init(uint32_t threadCount,
|
|||||||
[](auto&& q) { return q.empty(); }));
|
[](auto&& q) { return q.empty(); }));
|
||||||
});
|
});
|
||||||
|
|
||||||
SYSTRACE_VALUE32("CompilerThreadPool Jobs",
|
FILAMENT_TRACING_VALUE(FILAMENT_TRACING_CATEGORY_FILAMENT, "CompilerThreadPool Jobs",
|
||||||
mQueues[0].size() + mQueues[1].size());
|
mQueues[0].size() + mQueues[1].size());
|
||||||
|
|
||||||
if (UTILS_LIKELY(!mExitRequested)) {
|
if (UTILS_LIKELY(!mExitRequested)) {
|
||||||
|
|||||||
@@ -23,11 +23,12 @@
|
|||||||
#include <backend/BufferDescriptor.h>
|
#include <backend/BufferDescriptor.h>
|
||||||
#include <backend/DriverEnums.h>
|
#include <backend/DriverEnums.h>
|
||||||
|
|
||||||
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
#include <utils/ostream.h>
|
#include <utils/ostream.h>
|
||||||
#include <utils/Systrace.h>
|
|
||||||
|
|
||||||
#include <math/half.h>
|
#include <math/half.h>
|
||||||
#include <math/vec2.h>
|
#include <math/vec2.h>
|
||||||
@@ -148,33 +149,34 @@ void DriverBase::scheduleRelease(AcquiredImage const& image) noexcept {
|
|||||||
void DriverBase::debugCommandBegin(CommandStream* cmds, bool synchronous, const char* methodName) noexcept {
|
void DriverBase::debugCommandBegin(CommandStream* cmds, bool synchronous, const char* methodName) noexcept {
|
||||||
if constexpr (bool(FILAMENT_DEBUG_COMMANDS > FILAMENT_DEBUG_COMMANDS_NONE)) {
|
if constexpr (bool(FILAMENT_DEBUG_COMMANDS > FILAMENT_DEBUG_COMMANDS_NONE)) {
|
||||||
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_LOG)) {
|
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_LOG)) {
|
||||||
utils::slog.d << methodName << utils::io::endl;
|
DLOG(INFO) << methodName;
|
||||||
}
|
}
|
||||||
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_SYSTRACE)) {
|
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_SYSTRACE)) {
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
SYSTRACE_NAME_BEGIN(methodName);
|
FILAMENT_TRACING_NAME_BEGIN(FILAMENT_TRACING_CATEGORY_FILAMENT, methodName);
|
||||||
|
|
||||||
if (!synchronous) {
|
if (!synchronous) {
|
||||||
cmds->queueCommand([=]() {
|
cmds->queueCommand([=]() {
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
SYSTRACE_NAME_BEGIN(methodName);
|
FILAMENT_TRACING_NAME_BEGIN(FILAMENT_TRACING_CATEGORY_FILAMENT, methodName);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void DriverBase::debugCommandEnd(CommandStream* cmds, bool synchronous, const char* methodName) noexcept {
|
void DriverBase::debugCommandEnd(CommandStream* cmds, bool synchronous,
|
||||||
|
const char* methodName) noexcept {
|
||||||
if constexpr (bool(FILAMENT_DEBUG_COMMANDS > FILAMENT_DEBUG_COMMANDS_NONE)) {
|
if constexpr (bool(FILAMENT_DEBUG_COMMANDS > FILAMENT_DEBUG_COMMANDS_NONE)) {
|
||||||
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_SYSTRACE)) {
|
if constexpr (bool(FILAMENT_DEBUG_COMMANDS & FILAMENT_DEBUG_COMMANDS_SYSTRACE)) {
|
||||||
if (!synchronous) {
|
if (!synchronous) {
|
||||||
cmds->queueCommand([]() {
|
cmds->queueCommand([]() {
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
SYSTRACE_NAME_END();
|
FILAMENT_TRACING_NAME_END(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
SYSTRACE_CONTEXT();
|
FILAMENT_TRACING_CONTEXT(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
SYSTRACE_NAME_END();
|
FILAMENT_TRACING_NAME_END(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,7 +20,7 @@
|
|||||||
|
|
||||||
#include <utils/Allocator.h>
|
#include <utils/Allocator.h>
|
||||||
#include <utils/CString.h>
|
#include <utils/CString.h>
|
||||||
#include <utils/Log.h>
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
@@ -57,8 +57,8 @@ HandleAllocator<P0, P1, P2>::Allocator::Allocator(AreaPolicy::HeapArea const& ar
|
|||||||
size_t const maxHeapSize = std::min(area.size(), HANDLE_INDEX_MASK * getAlignment());
|
size_t const maxHeapSize = std::min(area.size(), HANDLE_INDEX_MASK * getAlignment());
|
||||||
|
|
||||||
if (UTILS_UNLIKELY(maxHeapSize != area.size())) {
|
if (UTILS_UNLIKELY(maxHeapSize != area.size())) {
|
||||||
slog.w << "HandleAllocator heap size reduced to "
|
LOG(WARNING) << "HandleAllocator heap size reduced to " << maxHeapSize << " from "
|
||||||
<< maxHeapSize << " from " << area.size() << io::endl;
|
<< area.size();
|
||||||
}
|
}
|
||||||
|
|
||||||
// make sure we start with a clean arena. This is needed to ensure that all blocks start
|
// make sure we start with a clean arena. This is needed to ensure that all blocks start
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
#include <backend/Platform.h>
|
#include <backend/Platform.h>
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <utils/compiler.h>
|
||||||
|
#include <utils/ostream.h>
|
||||||
|
|
||||||
#include <atomic>
|
#include <atomic>
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|||||||
@@ -16,7 +16,8 @@
|
|||||||
|
|
||||||
#include <private/backend/PlatformFactory.h>
|
#include <private/backend/PlatformFactory.h>
|
||||||
|
|
||||||
#include <utils/Systrace.h>
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
|
|
||||||
// We need to keep this up top for the linux (X11) name collisions.
|
// We need to keep this up top for the linux (X11) name collisions.
|
||||||
@@ -85,7 +86,7 @@ namespace filament::backend {
|
|||||||
// responsible for destroying it. Initialization of the backend API is deferred until
|
// responsible for destroying it. Initialization of the backend API is deferred until
|
||||||
// createDriver(). The passed-in backend hint is replaced with the resolved backend.
|
// createDriver(). The passed-in backend hint is replaced with the resolved backend.
|
||||||
Platform* PlatformFactory::create(Backend* backend) noexcept {
|
Platform* PlatformFactory::create(Backend* backend) noexcept {
|
||||||
SYSTRACE_CALL();
|
FILAMENT_TRACING_CALL(FILAMENT_TRACING_CATEGORY_FILAMENT);
|
||||||
assert_invariant(backend);
|
assert_invariant(backend);
|
||||||
|
|
||||||
#if defined(__ANDROID__)
|
#if defined(__ANDROID__)
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
#ifndef TNT_FILAMENT_BACKEND_SYSTRACEPROFILE_H
|
#ifndef TNT_FILAMENT_BACKEND_SYSTRACEPROFILE_H
|
||||||
#define TNT_FILAMENT_BACKEND_SYSTRACEPROFILE_H
|
#define TNT_FILAMENT_BACKEND_SYSTRACEPROFILE_H
|
||||||
|
|
||||||
#include <utils/Systrace.h>
|
#include <private/utils/Tracing.h>
|
||||||
|
|
||||||
#define PROFILE_SCOPE(marker) SYSTRACE_NAME(marker)
|
#define PROFILE_SCOPE(marker) SYSTRACE_NAME(marker)
|
||||||
|
|
||||||
|
|||||||
@@ -50,7 +50,7 @@ JavaVM* VirtualMachineEnv::getVirtualMachine() {
|
|||||||
*/
|
*/
|
||||||
UTILS_PUBLIC
|
UTILS_PUBLIC
|
||||||
UTILS_NOINLINE
|
UTILS_NOINLINE
|
||||||
jint VirtualMachineEnv::JNI_OnLoad(JavaVM* vm) noexcept {
|
jint VirtualMachineEnv::JNI_OnLoad(JavaVM* vm) {
|
||||||
std::lock_guard const lock(sLock);
|
std::lock_guard const lock(sLock);
|
||||||
if (sVirtualMachine) {
|
if (sVirtualMachine) {
|
||||||
// It doesn't make sense for JNI_OnLoad() to be called more than once
|
// It doesn't make sense for JNI_OnLoad() to be called more than once
|
||||||
@@ -77,7 +77,7 @@ VirtualMachineEnv& VirtualMachineEnv::get() noexcept {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UTILS_NOINLINE
|
UTILS_NOINLINE
|
||||||
JNIEnv* VirtualMachineEnv::getThreadEnvironment() noexcept {
|
JNIEnv* VirtualMachineEnv::getThreadEnvironment() {
|
||||||
JavaVM* const vm = getVirtualMachine();
|
JavaVM* const vm = getVirtualMachine();
|
||||||
JNIEnv* env = nullptr;
|
JNIEnv* env = nullptr;
|
||||||
jint const result = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
|
jint const result = vm->GetEnv(reinterpret_cast<void**>(&env), JNI_VERSION_1_6);
|
||||||
@@ -101,7 +101,7 @@ VirtualMachineEnv::~VirtualMachineEnv() noexcept {
|
|||||||
}
|
}
|
||||||
|
|
||||||
UTILS_NOINLINE
|
UTILS_NOINLINE
|
||||||
JNIEnv* VirtualMachineEnv::getEnvironmentSlow() noexcept {
|
JNIEnv* VirtualMachineEnv::getEnvironmentSlow() {
|
||||||
FILAMENT_CHECK_PRECONDITION(mVirtualMachine)
|
FILAMENT_CHECK_PRECONDITION(mVirtualMachine)
|
||||||
<< "JNI_OnLoad() has not been called";
|
<< "JNI_OnLoad() has not been called";
|
||||||
|
|
||||||
|
|||||||
@@ -19,8 +19,8 @@
|
|||||||
#include "MetalContext.h"
|
#include "MetalContext.h"
|
||||||
#include "MetalUtils.h"
|
#include "MetalUtils.h"
|
||||||
|
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
|
|
||||||
namespace filament::backend {
|
namespace filament::backend {
|
||||||
|
|
||||||
@@ -323,7 +323,7 @@ id<MTLFunction> MetalBlitter::compileFragmentFunction(BlitFunctionKey key) const
|
|||||||
if (!library || !function) {
|
if (!library || !function) {
|
||||||
if (error) {
|
if (error) {
|
||||||
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
||||||
utils::slog.e << description << utils::io::endl;
|
LOG(ERROR) << description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FILAMENT_CHECK_POSTCONDITION(library && function)
|
FILAMENT_CHECK_POSTCONDITION(library && function)
|
||||||
@@ -349,7 +349,7 @@ id<MTLFunction> MetalBlitter::getBlitVertexFunction() {
|
|||||||
if (!library || !function) {
|
if (!library || !function) {
|
||||||
if (error) {
|
if (error) {
|
||||||
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
||||||
utils::slog.e << description << utils::io::endl;
|
LOG(ERROR) << description;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FILAMENT_CHECK_POSTCONDITION(library && function)
|
FILAMENT_CHECK_POSTCONDITION(library && function)
|
||||||
|
|||||||
@@ -19,6 +19,8 @@
|
|||||||
|
|
||||||
#include "MetalContext.h"
|
#include "MetalContext.h"
|
||||||
|
|
||||||
|
#include <utils/Panic.h>
|
||||||
|
|
||||||
namespace filament {
|
namespace filament {
|
||||||
namespace backend {
|
namespace backend {
|
||||||
|
|
||||||
|
|||||||
@@ -18,8 +18,8 @@
|
|||||||
|
|
||||||
#include "MetalContext.h"
|
#include "MetalContext.h"
|
||||||
|
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
#include <utils/trap.h>
|
#include <utils/trap.h>
|
||||||
|
|
||||||
#include <thread>
|
#include <thread>
|
||||||
@@ -77,8 +77,7 @@ void MetalBufferPool::releaseBuffer(MetalBufferPoolEntry const *stage) noexcept
|
|||||||
|
|
||||||
auto iter = mUsedStages.find(stage);
|
auto iter = mUsedStages.find(stage);
|
||||||
if (iter == mUsedStages.end()) {
|
if (iter == mUsedStages.end()) {
|
||||||
utils::slog.e << "Unknown Metal buffer: " << stage->capacity << " bytes"
|
LOG(ERROR) << "Unknown Metal buffer: " << stage->capacity << " bytes";
|
||||||
<< utils::io::endl;
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
stage->lastAccessed = mCurrentFrame;
|
stage->lastAccessed = mCurrentFrame;
|
||||||
|
|||||||
@@ -18,8 +18,9 @@
|
|||||||
|
|
||||||
#include "MetalHandles.h"
|
#include "MetalHandles.h"
|
||||||
|
|
||||||
#include <utils/debug.h>
|
|
||||||
#include <utils/FixedCapacityVector.h>
|
#include <utils/FixedCapacityVector.h>
|
||||||
|
#include <utils/Logger.h>
|
||||||
|
#include <utils/debug.h>
|
||||||
|
|
||||||
#include <utility>
|
#include <utility>
|
||||||
|
|
||||||
@@ -112,8 +113,8 @@ id<MTLCommandBuffer> getPendingCommandBuffer(MetalContext* context) {
|
|||||||
auto errorCode = (MTLCommandBufferError)buffer.error.code;
|
auto errorCode = (MTLCommandBufferError)buffer.error.code;
|
||||||
if (@available(macOS 11.0, *)) {
|
if (@available(macOS 11.0, *)) {
|
||||||
if (errorCode == MTLCommandBufferErrorMemoryless) {
|
if (errorCode == MTLCommandBufferErrorMemoryless) {
|
||||||
utils::slog.w << "Metal: memoryless geometry limit reached. "
|
LOG(WARNING) << "Metal: memoryless geometry limit reached. Continuing with private "
|
||||||
"Continuing with private storage mode." << utils::io::endl;
|
"storage mode.";
|
||||||
context->memorylessLimitsReached = true;
|
context->memorylessLimitsReached = true;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -38,10 +38,10 @@
|
|||||||
#include <Metal/Metal.h>
|
#include <Metal/Metal.h>
|
||||||
#include <QuartzCore/QuartzCore.h>
|
#include <QuartzCore/QuartzCore.h>
|
||||||
|
|
||||||
#include <utils/Log.h>
|
#include <utils/Invocable.h>
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/sstream.h>
|
#include <utils/sstream.h>
|
||||||
#include <utils/Invocable.h>
|
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
@@ -78,20 +78,18 @@ Driver* MetalDriverFactory::create(PlatformMetal* const platform, const Platform
|
|||||||
// MetalVertexBufferInfo : 552 moderate
|
// MetalVertexBufferInfo : 552 moderate
|
||||||
// -- less than or equal to 552 bytes
|
// -- less than or equal to 552 bytes
|
||||||
|
|
||||||
utils::slog.d
|
DLOG(INFO) << "MetalSwapChain: " << sizeof(MetalSwapChain);
|
||||||
<< "\nMetalSwapChain: " << sizeof(MetalSwapChain)
|
DLOG(INFO) << "MetalBufferObject: " << sizeof(MetalBufferObject);
|
||||||
<< "\nMetalBufferObject: " << sizeof(MetalBufferObject)
|
DLOG(INFO) << "MetalVertexBuffer: " << sizeof(MetalVertexBuffer);
|
||||||
<< "\nMetalVertexBuffer: " << sizeof(MetalVertexBuffer)
|
DLOG(INFO) << "MetalVertexBufferInfo: " << sizeof(MetalVertexBufferInfo);
|
||||||
<< "\nMetalVertexBufferInfo: " << sizeof(MetalVertexBufferInfo)
|
DLOG(INFO) << "MetalIndexBuffer: " << sizeof(MetalIndexBuffer);
|
||||||
<< "\nMetalIndexBuffer: " << sizeof(MetalIndexBuffer)
|
DLOG(INFO) << "MetalRenderPrimitive: " << sizeof(MetalRenderPrimitive);
|
||||||
<< "\nMetalRenderPrimitive: " << sizeof(MetalRenderPrimitive)
|
DLOG(INFO) << "MetalTexture: " << sizeof(MetalTexture);
|
||||||
<< "\nMetalTexture: " << sizeof(MetalTexture)
|
DLOG(INFO) << "MetalTimerQuery: " << sizeof(MetalTimerQuery);
|
||||||
<< "\nMetalTimerQuery: " << sizeof(MetalTimerQuery)
|
DLOG(INFO) << "HwStream: " << sizeof(HwStream);
|
||||||
<< "\nHwStream: " << sizeof(HwStream)
|
DLOG(INFO) << "MetalRenderTarget: " << sizeof(MetalRenderTarget);
|
||||||
<< "\nMetalRenderTarget: " << sizeof(MetalRenderTarget)
|
DLOG(INFO) << "MetalFence: " << sizeof(MetalFence);
|
||||||
<< "\nMetalFence: " << sizeof(MetalFence)
|
DLOG(INFO) << "MetalProgram: " << sizeof(MetalProgram);
|
||||||
<< "\nMetalProgram: " << sizeof(MetalProgram)
|
|
||||||
<< utils::io::endl;
|
|
||||||
#endif
|
#endif
|
||||||
return MetalDriver::create(platform, driverConfig);
|
return MetalDriver::create(platform, driverConfig);
|
||||||
}
|
}
|
||||||
@@ -135,19 +133,18 @@ MetalDriver::MetalDriver(
|
|||||||
|
|
||||||
initializeSupportedGpuFamilies(mContext);
|
initializeSupportedGpuFamilies(mContext);
|
||||||
|
|
||||||
utils::slog.v << "Supported GPU families: " << utils::io::endl;
|
LOG(INFO) << "Supported GPU families: ";
|
||||||
if (mContext->highestSupportedGpuFamily.common > 0) {
|
if (mContext->highestSupportedGpuFamily.common > 0) {
|
||||||
utils::slog.v << " MTLGPUFamilyCommon" << (int) mContext->highestSupportedGpuFamily.common << utils::io::endl;
|
LOG(INFO) << " MTLGPUFamilyCommon" << (int) mContext->highestSupportedGpuFamily.common;
|
||||||
}
|
}
|
||||||
if (mContext->highestSupportedGpuFamily.apple > 0) {
|
if (mContext->highestSupportedGpuFamily.apple > 0) {
|
||||||
utils::slog.v << " MTLGPUFamilyApple" << (int) mContext->highestSupportedGpuFamily.apple << utils::io::endl;
|
LOG(INFO) << " MTLGPUFamilyApple" << (int) mContext->highestSupportedGpuFamily.apple;
|
||||||
}
|
}
|
||||||
if (mContext->highestSupportedGpuFamily.mac > 0) {
|
if (mContext->highestSupportedGpuFamily.mac > 0) {
|
||||||
utils::slog.v << " MTLGPUFamilyMac" << (int) mContext->highestSupportedGpuFamily.mac << utils::io::endl;
|
LOG(INFO) << " MTLGPUFamilyMac" << (int) mContext->highestSupportedGpuFamily.mac;
|
||||||
}
|
}
|
||||||
utils::slog.v << "Features:" << utils::io::endl;
|
LOG(INFO) << "Features:";
|
||||||
utils::slog.v << " readWriteTextureSupport: " <<
|
LOG(INFO) << " readWriteTextureSupport: " << (bool) mContext->device.readWriteTextureSupport;
|
||||||
(bool) mContext->device.readWriteTextureSupport << utils::io::endl;
|
|
||||||
|
|
||||||
// In order to support texture swizzling, the GPU needs to support it and the system be running
|
// In order to support texture swizzling, the GPU needs to support it and the system be running
|
||||||
// iOS 13+.
|
// iOS 13+.
|
||||||
@@ -588,7 +585,7 @@ void MetalDriver::createProgramR(Handle<HwProgram> rph, Program&& program) {
|
|||||||
#if FILAMENT_METAL_DEBUG_LOG
|
#if FILAMENT_METAL_DEBUG_LOG
|
||||||
auto handleId = rph.getId();
|
auto handleId = rph.getId();
|
||||||
DEBUG_LOG("createProgramR(rph = %d, program = ", handleId);
|
DEBUG_LOG("createProgramR(rph = %d, program = ", handleId);
|
||||||
utils::slog.d << program << utils::io::endl;
|
DLOG(INFO) << program;
|
||||||
#endif
|
#endif
|
||||||
construct_handle<MetalProgram>(rph, *mContext, std::move(program));
|
construct_handle<MetalProgram>(rph, *mContext, std::move(program));
|
||||||
}
|
}
|
||||||
@@ -672,22 +669,8 @@ void MetalDriver::createTimerQueryR(Handle<HwTimerQuery> tqh, int) {
|
|||||||
// nothing to do, timer query was constructed in createTimerQueryS
|
// nothing to do, timer query was constructed in createTimerQueryS
|
||||||
}
|
}
|
||||||
|
|
||||||
const char* toString(DescriptorType type) {
|
UTILS_UNUSED
|
||||||
switch (type) {
|
static const char* toString(ShaderStageFlags flags) {
|
||||||
case DescriptorType::UNIFORM_BUFFER:
|
|
||||||
return "UNIFORM_BUFFER";
|
|
||||||
case DescriptorType::SHADER_STORAGE_BUFFER:
|
|
||||||
return "SHADER_STORAGE_BUFFER";
|
|
||||||
case DescriptorType::SAMPLER:
|
|
||||||
return "SAMPLER";
|
|
||||||
case DescriptorType::INPUT_ATTACHMENT:
|
|
||||||
return "INPUT_ATTACHMENT";
|
|
||||||
case DescriptorType::SAMPLER_EXTERNAL:
|
|
||||||
return "SAMPLER_EXTERNAL";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const char* toString(ShaderStageFlags flags) {
|
|
||||||
std::vector<const char*> stages;
|
std::vector<const char*> stages;
|
||||||
if (any(flags & ShaderStageFlags::VERTEX)) {
|
if (any(flags & ShaderStageFlags::VERTEX)) {
|
||||||
stages.push_back("VERTEX");
|
stages.push_back("VERTEX");
|
||||||
@@ -721,15 +704,25 @@ const char* toString(DescriptorFlags flags) {
|
|||||||
|
|
||||||
void MetalDriver::createDescriptorSetLayoutR(
|
void MetalDriver::createDescriptorSetLayoutR(
|
||||||
Handle<HwDescriptorSetLayout> dslh, DescriptorSetLayout&& info) {
|
Handle<HwDescriptorSetLayout> dslh, DescriptorSetLayout&& info) {
|
||||||
|
#if FILAMENT_METAL_DEBUG_LOG == 1
|
||||||
|
const char* labelStr = "";
|
||||||
|
std::visit([&labelStr](auto&& arg) {
|
||||||
|
using T = std::decay_t<decltype(arg)>;
|
||||||
|
if constexpr (std::is_same_v<T, utils::CString> || std::is_same_v<T, utils::StaticString>) {
|
||||||
|
labelStr = arg.c_str();
|
||||||
|
}
|
||||||
|
}, info.label);
|
||||||
std::sort(info.bindings.begin(), info.bindings.end(),
|
std::sort(info.bindings.begin(), info.bindings.end(),
|
||||||
[](const auto& a, const auto& b) { return a.binding < b.binding; });
|
[](const auto& a, const auto& b) { return a.binding < b.binding; });
|
||||||
DEBUG_LOG("createDescriptorSetLayoutR(dslh = %d, info = {\n", dslh.getId());
|
DEBUG_LOG("createDescriptorSetLayoutR(dslh = %d, info = { label = %s,\n", dslh.getId(),
|
||||||
|
labelStr);
|
||||||
for (size_t i = 0; i < info.bindings.size(); i++) {
|
for (size_t i = 0; i < info.bindings.size(); i++) {
|
||||||
DEBUG_LOG(" {binding = %d, type = %s, count = %d, stage = %s, flags = %s},\n",
|
DEBUG_LOG(" {binding = %d, type = %s, count = %d, stage = %s, flags = %s},\n",
|
||||||
info.bindings[i].binding, toString(info.bindings[i].type), info.bindings[i].count,
|
info.bindings[i].binding, toString(info.bindings[i].type), info.bindings[i].count,
|
||||||
toString(info.bindings[i].stageFlags), toString(info.bindings[i].flags));
|
toString(info.bindings[i].stageFlags), toString(info.bindings[i].flags));
|
||||||
}
|
}
|
||||||
DEBUG_LOG("})\n");
|
DEBUG_LOG("})\n");
|
||||||
|
#endif
|
||||||
construct_handle<MetalDescriptorSetLayout>(dslh, std::move(info));
|
construct_handle<MetalDescriptorSetLayout>(dslh, std::move(info));
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2081,7 +2074,7 @@ void MetalDriver::dispatchCompute(Handle<HwProgram> program, math::uint3 workGro
|
|||||||
error:&error];
|
error:&error];
|
||||||
if (error) {
|
if (error) {
|
||||||
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
||||||
utils::slog.e << description << utils::io::endl;
|
LOG(ERROR) << description;
|
||||||
}
|
}
|
||||||
assert_invariant(!error);
|
assert_invariant(!error);
|
||||||
|
|
||||||
|
|||||||
@@ -185,6 +185,7 @@ inline MTLPixelFormat getMetalFormat(PixelDataFormat format, PixelDataType type)
|
|||||||
CONVERT(RGBA_INTEGER, UINT, RGBA32Uint);
|
CONVERT(RGBA_INTEGER, UINT, RGBA32Uint);
|
||||||
CONVERT(RGBA_INTEGER, INT, RGBA32Sint);
|
CONVERT(RGBA_INTEGER, INT, RGBA32Sint);
|
||||||
CONVERT(RGBA, FLOAT, RGBA32Float);
|
CONVERT(RGBA, FLOAT, RGBA32Float);
|
||||||
|
CONVERT(DEPTH_COMPONENT, FLOAT, Depth32Float);
|
||||||
#undef CONVERT
|
#undef CONVERT
|
||||||
|
|
||||||
return MTLPixelFormatInvalid;
|
return MTLPixelFormatInvalid;
|
||||||
|
|||||||
@@ -20,14 +20,14 @@
|
|||||||
#include "MetalEnums.h"
|
#include "MetalEnums.h"
|
||||||
#include "MetalUtils.h"
|
#include "MetalUtils.h"
|
||||||
|
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/Log.h>
|
|
||||||
#include <utils/trap.h>
|
#include <utils/trap.h>
|
||||||
|
|
||||||
#define NSERROR_CHECK(message) \
|
#define NSERROR_CHECK(message) \
|
||||||
if (error) { \
|
if (error) { \
|
||||||
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding]; \
|
auto description = [error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding]; \
|
||||||
utils::slog.e << description << utils::io::endl; \
|
LOG(ERROR) << description; \
|
||||||
} \
|
} \
|
||||||
FILAMENT_CHECK_POSTCONDITION(error == nil) << message;
|
FILAMENT_CHECK_POSTCONDITION(error == nil) << message;
|
||||||
|
|
||||||
|
|||||||
@@ -27,10 +27,11 @@
|
|||||||
|
|
||||||
#include "private/backend/BackendUtils.h"
|
#include "private/backend/BackendUtils.h"
|
||||||
|
|
||||||
#include <utils/compiler.h>
|
#include <utils/Logger.h>
|
||||||
#include <utils/Panic.h>
|
#include <utils/Panic.h>
|
||||||
#include <utils/trap.h>
|
#include <utils/compiler.h>
|
||||||
#include <utils/debug.h>
|
#include <utils/debug.h>
|
||||||
|
#include <utils/trap.h>
|
||||||
|
|
||||||
#include <math/scalar.h>
|
#include <math/scalar.h>
|
||||||
|
|
||||||
@@ -115,14 +116,14 @@ MetalSwapChain::MetalSwapChain(
|
|||||||
type(SwapChainType::CAMETALLAYER) {
|
type(SwapChainType::CAMETALLAYER) {
|
||||||
|
|
||||||
if (!(flags & SwapChain::CONFIG_TRANSPARENT) && !nativeWindow.opaque) {
|
if (!(flags & SwapChain::CONFIG_TRANSPARENT) && !nativeWindow.opaque) {
|
||||||
utils::slog.w << "Warning: Filament SwapChain has no CONFIG_TRANSPARENT flag, "
|
LOG(WARNING) << "Warning: Filament SwapChain has no CONFIG_TRANSPARENT flag, but the "
|
||||||
"but the CAMetaLayer(" << (__bridge void*) nativeWindow << ")"
|
"CAMetaLayer("
|
||||||
" has .opaque set to NO." << utils::io::endl;
|
<< (__bridge void*) nativeWindow << ") has .opaque set to NO.";
|
||||||
}
|
}
|
||||||
if ((flags & SwapChain::CONFIG_TRANSPARENT) && nativeWindow.opaque) {
|
if ((flags & SwapChain::CONFIG_TRANSPARENT) && nativeWindow.opaque) {
|
||||||
utils::slog.w << "Warning: Filament SwapChain has the CONFIG_TRANSPARENT flag, "
|
LOG(WARNING) << "Warning: Filament SwapChain has the CONFIG_TRANSPARENT flag, but the "
|
||||||
"but the CAMetaLayer(" << (__bridge void*) nativeWindow << ")"
|
"CAMetaLayer("
|
||||||
" has .opaque set to YES." << utils::io::endl;
|
<< (__bridge void*) nativeWindow << ") has .opaque set to YES.";
|
||||||
}
|
}
|
||||||
|
|
||||||
// Needed so we can use the SwapChain as a blit source.
|
// Needed so we can use the SwapChain as a blit source.
|
||||||
@@ -1356,7 +1357,31 @@ id<MTLArgumentEncoder> MetalDescriptorSetLayout::getArgumentEncoderSlow(id<MTLDe
|
|||||||
[arguments addObject:bufferArgument];
|
[arguments addObject:bufferArgument];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DescriptorType::SAMPLER:
|
case DescriptorType::SAMPLER_2D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_3D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_3D_INT:
|
||||||
|
case DescriptorType::SAMPLER_3D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_UINT:
|
||||||
case DescriptorType::SAMPLER_EXTERNAL: {
|
case DescriptorType::SAMPLER_EXTERNAL: {
|
||||||
MTLArgumentDescriptor* textureArgument = [MTLArgumentDescriptor argumentDescriptor];
|
MTLArgumentDescriptor* textureArgument = [MTLArgumentDescriptor argumentDescriptor];
|
||||||
textureArgument.index = binding.binding * 2;
|
textureArgument.index = binding.binding * 2;
|
||||||
@@ -1382,6 +1407,9 @@ id<MTLArgumentEncoder> MetalDescriptorSetLayout::getArgumentEncoderSlow(id<MTLDe
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if (arguments.count == 0) {
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
return [device newArgumentEncoderWithArguments:arguments];
|
return [device newArgumentEncoderWithArguments:arguments];
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1442,6 +1470,9 @@ id<MTLBuffer> MetalDescriptorSet::finalizeAndGetBuffer(MetalDriver* driver, Shad
|
|||||||
|
|
||||||
id<MTLArgumentEncoder> encoder =
|
id<MTLArgumentEncoder> encoder =
|
||||||
layout->getArgumentEncoder(context.device, stage, textureTypes);
|
layout->getArgumentEncoder(context.device, stage, textureTypes);
|
||||||
|
if (!encoder) {
|
||||||
|
return nil;
|
||||||
|
}
|
||||||
|
|
||||||
{
|
{
|
||||||
ScopedAllocationTimer timer("descriptor_set");
|
ScopedAllocationTimer timer("descriptor_set");
|
||||||
@@ -1472,7 +1503,31 @@ id<MTLBuffer> MetalDescriptorSet::finalizeAndGetBuffer(MetalDriver* driver, Shad
|
|||||||
atIndex:binding.binding * 2];
|
atIndex:binding.binding * 2];
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case DescriptorType::SAMPLER:
|
case DescriptorType::SAMPLER_2D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_UINT:
|
||||||
|
case DescriptorType::SAMPLER_CUBE_ARRAY_DEPTH:
|
||||||
|
case DescriptorType::SAMPLER_3D_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_3D_INT:
|
||||||
|
case DescriptorType::SAMPLER_3D_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_UINT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_FLOAT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_INT:
|
||||||
|
case DescriptorType::SAMPLER_2D_MS_ARRAY_UINT:
|
||||||
case DescriptorType::SAMPLER_EXTERNAL: {
|
case DescriptorType::SAMPLER_EXTERNAL: {
|
||||||
auto found = textures.find(binding.binding);
|
auto found = textures.find(binding.binding);
|
||||||
if (found == textures.end()) {
|
if (found == textures.end()) {
|
||||||
|
|||||||
@@ -21,6 +21,7 @@
|
|||||||
#include <backend/Program.h>
|
#include <backend/Program.h>
|
||||||
|
|
||||||
#include <utils/JobSystem.h>
|
#include <utils/JobSystem.h>
|
||||||
|
#include <utils/Logger.h>
|
||||||
#include <utils/Mutex.h>
|
#include <utils/Mutex.h>
|
||||||
|
|
||||||
#include <chrono>
|
#include <chrono>
|
||||||
@@ -147,7 +148,7 @@ bool MetalShaderCompiler::isParallelShaderCompileSupported() const noexcept {
|
|||||||
if (error) {
|
if (error) {
|
||||||
auto description =
|
auto description =
|
||||||
[error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
[error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
||||||
utils::slog.w << description << utils::io::endl;
|
LOG(WARNING) << description;
|
||||||
errorMessage = error.localizedDescription;
|
errorMessage = error.localizedDescription;
|
||||||
}
|
}
|
||||||
PANIC_LOG("Failed to compile Metal program.");
|
PANIC_LOG("Failed to compile Metal program.");
|
||||||
@@ -178,7 +179,7 @@ bool MetalShaderCompiler::isParallelShaderCompileSupported() const noexcept {
|
|||||||
if (error) {
|
if (error) {
|
||||||
auto description =
|
auto description =
|
||||||
[error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
[error.localizedDescription cStringUsingEncoding:NSUTF8StringEncoding];
|
||||||
utils::slog.w << description << utils::io::endl;
|
LOG(WARNING) << description;
|
||||||
errorMessage = error.localizedDescription;
|
errorMessage = error.localizedDescription;
|
||||||
}
|
}
|
||||||
PANIC_LOG("Failed to load main0 in Metal program.");
|
PANIC_LOG("Failed to load main0 in Metal program.");
|
||||||
|
|||||||
@@ -20,18 +20,19 @@
|
|||||||
#include <Metal/Metal.h>
|
#include <Metal/Metal.h>
|
||||||
|
|
||||||
#include "private/backend/Driver.h"
|
#include "private/backend/Driver.h"
|
||||||
#include "backend/Program.h"
|
|
||||||
|
|
||||||
#include <backend/DriverEnums.h>
|
#include <backend/DriverEnums.h>
|
||||||
|
#include <backend/Program.h>
|
||||||
|
|
||||||
|
#include <utils/bitset.h>
|
||||||
#include <utils/FixedCapacityVector.h>
|
#include <utils/FixedCapacityVector.h>
|
||||||
|
|
||||||
#include <memory>
|
|
||||||
#include <tsl/robin_map.h>
|
|
||||||
|
|
||||||
#include <utils/Hash.h>
|
#include <utils/Hash.h>
|
||||||
#include <utils/Invocable.h>
|
#include <utils/Invocable.h>
|
||||||
|
|
||||||
|
#include <tsl/robin_map.h>
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
namespace filament {
|
namespace filament {
|
||||||
namespace backend {
|
namespace backend {
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user