Change-Id: Id4670bee051aa91081cab7dd313ef8a1bbeb4708
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

Change-Id: Icc4f2b8c3e64f657c20abea121ca65599d5510e0
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I7db983b4a0c371b9f76e7748ca7fdb875f655e3e
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I357928ad064d555b0e1ade1a409a29bffd0ea172
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I22e1cc9b3946a4a810ccf6083eeb6c677f5ad453
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Fixes HDRBloomTonemap

Change-Id: I162306c9ae6c267d6d7ffa18479f2912163b127c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: Ie6bce6e609e1b4d8867adab992cb88ef07533d4f
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Change-Id: I1bbf499ef245a1ab8bbcbee67e7dcd895da83788
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Including a quick-and-dirty colour picker, to avoid dragging in widgets
as a dependency.

Change-Id: Iebf335c9ffc8c73fe757e614ff15d48d4ec40096
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I6313eac482a7b1de1e211503d1812c673f6f7184
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Task-number: QTBUG-82550
Change-Id: I5c4bbb377469ea14a97634e7394c5b9cd803cbae
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: I42adb10372fe65e840744d86004b8033e4b0676b
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I1a2f06fcc3302393397996a0408a11e585c063ec
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

This matches the behaviour of the direct gl code path.

Change-Id: Idfd2a8c0539638c7f674c74db5234671efda0eee
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: I54854256a0874c122439f0dbf046b266d1d2f312
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Makes the Fxaa effect work

Change-Id: I6b64fbb5bda19832d953c10b51ccf9c2fddf671c
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

The HDRBloomTonemap effect works now.

Task-number: QTBUG-82550
Change-Id: I4fc9ffab4f354e4660d21d6cba4b30ef6706c92e
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

The TiltShift built-in effect works now.

Task-number: QTBUG-82550
Change-Id: I10246a579a837052e550af749c41f2769ea0c2bf
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Change-Id: I592d1067e64bcb513b4b329b25608a4d7b788ae7
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I42c2986cb9239e013be26a1fda4c175e7dd5d850
Reviewed-by: Jere Tuliniemi <jere.tuliniemi@qt.io>
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Qt Submodule Update Bot authored 5 years ago and Simon Hausmann committed 5 years ago

Also fix build after internal QML API changes.

Change-Id: I590d9ba9a118fe9d7a996c65bfd2fd9be6c8004e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I3177e2a649bd7bc0c3d5f3d0ef12b0e249e8d96e
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: I05ffd230a0314ab22f7d804f916555e79fb41a01
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: Ib9d72093f897869261b00ac0d9f2b946ace06493
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Task-number: QTBUG-82957
Change-Id: I1141c66781b206e834b3c96f5da3d3330fd76f5c
Reviewed-by: Andy Nichols <andy.nichols@qt.io>

Also fixes leaking the renderer object.

Task-number: QTBUG-82793
Change-Id: Iea740c498d4e0d8fd880bed78a7af9aa9081b4a7
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

Effect shaders assume these are available.
This fixes the Scatter effect.

Change-Id: I8b2031885c3681e83f6662b5a2fb16b4fc3ec802
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Change-Id: I58253c9759634c1537904d4a88f6a81c95bedafb
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I2a4efd685bb3d9e64ea6dc58dab0bbc46f8f4f35
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change-Id: I11f43f660ede7b5a97ed03a36a3578851cb7c41a
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Brushstrokes work. Scatter is still unstable because of the "magic"
AppFrame uniform.

In brushtrokes.frag, the only usage of the texture "flag" snapper
uniform is removed. In the directGL code, this value is hardcoded to
1, with the comment "I have no idea what these flags do". We can
reintroduce support for this later if necessary.

Change-Id: I7eb207cb76e73b6af08fbd44e1fe38af3e3373d6
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>

Change-Id: Id17fb83294a80fe11e7b3747f4427ef2b8d2b0ff
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

Change the contents to make the results more obvious.

Change-Id: Ic43550f9d4a8374a88a87f8e45003d3537bfd2e6
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Make sure effects texture size is the same as the one we're
rendering to. Clean up the texture size logic a little.

Change-Id: Ica1c50561a7ae84bd94f3e53091e6999f30bcc04
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

Also prepares for using this in effect system.

Change-Id: If49dbf5afdc89b882545202b8b57b7115907e58f
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

There is UI to change some of the parameters for some of the effects. The rest
is left as an exercise for those who need to test those effects.

Change-Id: Ie684cbf43b7d2a985a104f4c3c5d543ec1860457
Reviewed-by: Eirik Aavitsland <eirik.aavitsland@qt.io>

Task-number: QTBUG-82135
Change-Id: I32153a20ff15d1ae33f7a0eca33a598b32106d9a
Reviewed-by: Christian Strømme <christian.stromme@qt.io>

Task-number: QTBUG-82280
Task-number: QTBUG-82281
Change-Id: I8ae773154bd2a5fa0f38375e30c24360a4557ccd
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>

In practice the ambient occlusion factor calculated is not used in any
of the built-in custom materials, so SSAO has no effect (even though
enabling it will generate the AO map). This is out of this patch's scope
to solve. What this ensures is that the textures are correctly exposed.

Also note that SSDO is not supported in the code base (it never was, and
has no public API to enable it), so we will not bother with the cbAoShadow
uniform block that would only be used by SSDO.

Change-Id: Ic4cb90f52276ecf364c20fffd1c9355702773c5d
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>
Reviewed-by: Eskil Abrahamsen Blomfeldt <eskil.abrahamsen-blomfeldt@qt.io>

...as much as possible.

Introduces custom material support for lighting, light probes, and shadow
mapping. Also blending and culling modes.

Also handles uEnvironmentMappingEnabled correctly for custom materials
now. This means that setting it to false actually disables sampling the
environment map texture.

It is worth noting that the built-in custom material shaders are not
prepared and, as of now, should not be expected to handle lighting: it
seems they were not created with lighting and shadow maps in mind. This
means they will not correctly participate in lighting and shadowing, even
when environment mapping is disabled. It is out of scope for this patch to
handle this further.

Task-number: QTBUG-82245
Change-Id: Id70714ef45c8e4b9824aaa626ca7b5ad410a7887
Reviewed-by: Paul Olav Tvete <paul.tvete@qt.io>