diff options
| author | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-25 18:31:39 +0200 |
|---|---|---|
| committer | Laszlo Agocs <laszlo.agocs@qt.io> | 2020-05-26 13:49:52 +0200 |
| commit | fe42d2ea631b82974dbccbe65c6f039b837c9150 (patch) | |
| tree | 0e4b7d94d169693acac72d7739744e304b0abd77 /src/particles | |
| parent | 90e645c7ac1d754efa90fa7be6555baa33f545e6 (diff) | |
Store DXBC instead of HLSL source in the qsb files
Add the -c argument when invoking qsb. The scripts are batch files
already so they imply being run on Windows. With a standard VS prompt
one gets fxc in the PATH too so we can let qsb invoke it.
The result is that the built-in materials' qsb files do not contain HLSL
source code anymore, rather they have the intermediate format with
bytecode (conceptually this is like SPIR-V). So at run time there are
no calls to d3dCompile() anymore when these shaders are involved.
What does this mean in practice? With a few select examples:
shapes, opening the Gallery view - before: 80 ms spent on HLSL source
compilation - after: 0 ms.
imageparticle, opening the first 3 views - before: 166 ms spent on HLSL
source compilation - after: 0 ms
shadereffects - before: 77 ms spent on HLSL source compilation - after:
29 ms (because this has custom shaders that still ship HLSL source)
Long term this can hopefully be folded into qsb's to-be-implemented build
system integration, so that it can automatically invoke the appropriate
shader compiler on Windows and macOS. But for now we just do it manually
and check in the regenerated .qsb files.
Fixes: QTBUG-84268
Change-Id: Ibe2f80f99b3e52d5eb5eb808ea103cc766d22c04
Reviewed-by: Andy Nichols <andy.nichols@qt.io>
Diffstat (limited to 'src/particles')
| -rwxr-xr-x | src/particles/shaders_ng/compile.bat | 23 | ||||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_colored.frag.qsb | bin | 1506 -> 1725 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_colored.vert.qsb | bin | 3293 -> 3794 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_deformed.frag.qsb | bin | 1516 -> 1749 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_deformed.vert.qsb | bin | 4641 -> 5884 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_simple.frag.qsb | bin | 1512 -> 1730 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_simple.vert.qsb | bin | 3160 -> 3778 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_sprite.frag.qsb | bin | 1846 -> 2088 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_sprite.vert.qsb | bin | 5330 -> 6625 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_tabled.frag.qsb | bin | 1709 -> 1951 bytes | |||
| -rw-r--r-- | src/particles/shaders_ng/imageparticle_tabled.vert.qsb | bin | 4987 -> 6234 bytes |
11 files changed, 13 insertions, 10 deletions
diff --git a/src/particles/shaders_ng/compile.bat b/src/particles/shaders_ng/compile.bat index 2376d5bf6d..b44fb5ed5a 100755 --- a/src/particles/shaders_ng/compile.bat +++ b/src/particles/shaders_ng/compile.bat @@ -37,17 +37,20 @@ :: ::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::::: -qsb -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_simple.vert.qsb imageparticle.vert -qsb --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_simple.frag.qsb imageparticle.frag +:: For HLSL we invoke fxc.exe (-c argument) and store the resulting intermediate format +:: instead of HLSL source, so this needs to be run on Windows from a developer command prompt. -qsb -DTABLE -DDEFORM -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_tabled.vert.qsb imageparticle.vert -qsb -DTABLE -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_tabled.frag.qsb imageparticle.frag +qsb -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_simple.vert.qsb imageparticle.vert +qsb --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_simple.frag.qsb imageparticle.frag -qsb -DDEFORM -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_deformed.vert.qsb imageparticle.vert -qsb -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_deformed.frag.qsb imageparticle.frag +qsb -DTABLE -DDEFORM -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_tabled.vert.qsb imageparticle.vert +qsb -DTABLE -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_tabled.frag.qsb imageparticle.frag -qsb -DSPRITE -DTABLE -DDEFORM -DCOLOR -b --zorder-loc 8 --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_sprite.vert.qsb imageparticle.vert -qsb -DSPRITE -DTABLE -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_sprite.frag.qsb imageparticle.frag +qsb -DDEFORM -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_deformed.vert.qsb imageparticle.vert +qsb -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_deformed.frag.qsb imageparticle.frag -qsb -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_colored.vert.qsb imageparticle.vert -qsb -DCOLOR --glsl "150,120,100 es" --hlsl 50 --msl 12 -o imageparticle_colored.frag.qsb imageparticle.frag +qsb -DSPRITE -DTABLE -DDEFORM -DCOLOR -b --zorder-loc 8 --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_sprite.vert.qsb imageparticle.vert +qsb -DSPRITE -DTABLE -DDEFORM -DCOLOR --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_sprite.frag.qsb imageparticle.frag + +qsb -DCOLOR -b --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_colored.vert.qsb imageparticle.vert +qsb -DCOLOR --glsl "150,120,100 es" --hlsl 50 -c --msl 12 -o imageparticle_colored.frag.qsb imageparticle.frag diff --git a/src/particles/shaders_ng/imageparticle_colored.frag.qsb b/src/particles/shaders_ng/imageparticle_colored.frag.qsb Binary files differindex 106109271e..c33fce8a1e 100644 --- a/src/particles/shaders_ng/imageparticle_colored.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_colored.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_colored.vert.qsb b/src/particles/shaders_ng/imageparticle_colored.vert.qsb Binary files differindex e29c1029c1..2283c50190 100644 --- a/src/particles/shaders_ng/imageparticle_colored.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_colored.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_deformed.frag.qsb b/src/particles/shaders_ng/imageparticle_deformed.frag.qsb Binary files differindex d2f74b40df..da0726eacc 100644 --- a/src/particles/shaders_ng/imageparticle_deformed.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_deformed.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_deformed.vert.qsb b/src/particles/shaders_ng/imageparticle_deformed.vert.qsb Binary files differindex c2e5bab0cb..efc5d6b29e 100644 --- a/src/particles/shaders_ng/imageparticle_deformed.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_deformed.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_simple.frag.qsb b/src/particles/shaders_ng/imageparticle_simple.frag.qsb Binary files differindex 8031dc8765..9f862f5e22 100644 --- a/src/particles/shaders_ng/imageparticle_simple.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_simple.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_simple.vert.qsb b/src/particles/shaders_ng/imageparticle_simple.vert.qsb Binary files differindex 03f71415f5..0bd789618b 100644 --- a/src/particles/shaders_ng/imageparticle_simple.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_simple.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_sprite.frag.qsb b/src/particles/shaders_ng/imageparticle_sprite.frag.qsb Binary files differindex 847de59aa6..314759b452 100644 --- a/src/particles/shaders_ng/imageparticle_sprite.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_sprite.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_sprite.vert.qsb b/src/particles/shaders_ng/imageparticle_sprite.vert.qsb Binary files differindex e310af8fc8..10115abee3 100644 --- a/src/particles/shaders_ng/imageparticle_sprite.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_sprite.vert.qsb diff --git a/src/particles/shaders_ng/imageparticle_tabled.frag.qsb b/src/particles/shaders_ng/imageparticle_tabled.frag.qsb Binary files differindex 6fe2d5a3f2..f511dbcf84 100644 --- a/src/particles/shaders_ng/imageparticle_tabled.frag.qsb +++ b/src/particles/shaders_ng/imageparticle_tabled.frag.qsb diff --git a/src/particles/shaders_ng/imageparticle_tabled.vert.qsb b/src/particles/shaders_ng/imageparticle_tabled.vert.qsb Binary files differindex 740f6b6769..0645de0dcd 100644 --- a/src/particles/shaders_ng/imageparticle_tabled.vert.qsb +++ b/src/particles/shaders_ng/imageparticle_tabled.vert.qsb |