Commit Graph

24 Commits

Author SHA1 Message Date
Liang Qi 79349119c6 Merge remote-tracking branch 'origin/5.7' into dev
Change-Id: I326616356ee26d4532c6d57558c43c919f0a900d
2016-08-19 21:22:10 +02:00
Simon Hausmann 852e60e67b Ignore generated QML/JS code cache files
Change-Id: Ic6fd156a1f9088c35d217a6f450610ac4b7d3284
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-08-15 07:59:53 +00:00
Simon Hausmann b1eeb7cdde Update .gitignore
Added the target wrappers shell scripts generated by commit
282f15feaae4c525602d537ab65cb61987eb5f7f from qtbase to the list of ignored
files. Similarly the config.log is also not desirable for version tracking.

Change-Id: I5cf832ea706f2109d2935cc6a086ece0979cc588
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
2016-08-15 07:58:22 +00:00
Laszlo Agocs c64d60e694 D3D12: Basic image support
For now there is no mipmapping, no atlases, and all image data is
converted to RGBA8888. Regardless, this already makes it possible to use
basic Image elements.

Follow the same pattern as with rectangles: most of the code is shared
via a material-less, abstract QSGDefaultNoMaterialImageNode, with the
material-related bits provided by QSGDefaultImageNode for GL and
QSGD3D12ImageNode for D3D.

Also fixes the harmless but incorrect miscalculation of the VBV size for
indexed draws.

Image data is copied into an intermediate upload buffer when invoking the
render context's createTexture(). The upload is triggered on a separate copy
command queue. The main command queue is synchronized via a fence before
executing the commands for the current frame.

Root signatures are now cached more cleverly and include zero or more SRVs
as parameter 1. This involves the engine having to manage a shader (GPU) visible
CBV-SRV-UAV descriptor heap as well.

Change-Id: I67c35577ff2677e1c7776dd8e5011860e2d78b00
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-03-07 16:13:06 +00:00
Laszlo Agocs 2d1f8937ac Add the skeleton for a D3D12 backend
Proof of concept. The plan is to proceed slowly with supporting node types
one by one, starting with QSGRectangleNode.

Opaque rectangles work already, but only non-smooth for now. The renderer is
incomplete (no clip/opacity) and is based on simplerenderer on scenegraph playground.
Buffer handling is not necessarily optimal yet.

Use QT_QUICK_BACKEND=d3d12 to request this backend. Set QT_D3D_DEBUG=1 to
enable the D3D debug layer. The render loop handles everything, incl. swap
chain setup, handling resizes, etc. This being D3D, there are no further
enablers needed from the QtGui or platform plugin side.

By default the first hardware adapter is picked. In the absence of that,
WARP is tried. The list of adapters is printed at startup, use
QT_D3D_ADAPTER_INDEX to force a given card in case there are multiple
ones in the system.

The goal is not to productize a fast and great renderer, but to pave the way to
better future backends for D3D12 and similar graphics APIs.

Compiling in the support into Qt Quick is bad since the dependency onto
d3d12.dll is not necessarily acceptable, but it's good enough for now, this
being a wip branch.

Change-Id: Ifbe088e7507223328096b22eec2c73f77bb5680e
Reviewed-by: Andy Nichols <andy.nichols@theqtcompany.com>
2016-02-19 14:51:37 +00:00
Nobuaki Sukegawa ee771dda2e Add files generated by tests to gitignore
Change-Id: I1fac4df1e00cbe37c0c9ea69562dffc1eb4d5111
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
2014-12-20 20:24:25 +01:00
J-P Nurmi d0c58e6ad2 Cleanup remaining QtQuick.Dialogs leftovers
QtQuick.Dialogs was moved to the qtquickcontrols module in Qt 5.3

Change-Id: I16d03dc1c342d396963c5bec3125b3d11d0d9bed
Reviewed-by: Topi Reiniö <topi.reinio@digia.com>
2014-09-19 13:21:53 +02:00
Rainer Keller e5bed09956 Remove qtdemo from gitignore
QtDemo was removed with a commit in qtdoc.

Change-Id: I75228b748a2307a713f0c86ecf144dae3b3569a3
Reviewed-by: Alessandro Portale <alessandro.portale@digia.com>
2014-09-19 09:10:12 +02:00
J-P Nurmi 245352fa45 Build/install the qmleasing tool to bindir
Change-Id: Icc65ecf8ec7e2ef19d4181788706a23b186ead14
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2014-03-27 18:20:26 +01:00
Shawn Rutledge 2f83bdbe5d Dialogs: use resources for QML and images
All the qml and image files are embedded in the QtQuick.Dialogs plugin.
If DefaultFileDialog.qml is missing from the installation directory,
loading from resources will be enabled. Otherwise, the files will be
loaded from the local path.

This is analogous to change b2e5d1acb1aca93157a6d4d0a026153134f9ad01
in Qt Quick Controls: it reduces the number of files that need to be
installed, but also preserves ease of debugging whenever the QML files
are separately installed.

Task-number: QTBUG-31565
Change-Id: Idbe6be5d818eb6a25367f2053ea52bc7ac1485bc
Reviewed-by: Caroline Chao <caroline.chao@digia.com>
2013-10-16 10:39:38 +02:00
Simon Hausmann b67667d0d9 Revert "Simplify JS bindings generation"
This reverts commit f227c3392b.

Conflicts:
	src/qml/qml/v4/qv4object_p.h
	src/qml/qml/v4/v4.pri
	src/qml/qml/v4/v4classgen

Change-Id: I8aba402878a460ac612c853d14650efc6cb21761
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-06-13 14:17:03 +02:00
Simon Hausmann f227c3392b Simplify JS bindings generation
Added a little helper script that can generate the code to
set up the prototype properties

Change-Id: I957ed4419c8b16398720fea4203c1a00434c4fba
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-05-06 14:47:45 +02:00
Simon Hausmann 891f702945 Fix compilation with built-in v4vm JS engine
Change-Id: Ieda9267e296acf6392a5461f4cfb9233a7a409a0
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
2013-04-15 13:03:20 +02:00
Miikka Heikkinen d194a31bdb Add qmake generated files to .gitignore.
Add source files generated by qmake for automatic static plugin
imports to .gitignore.

Change-Id: I4c5488bdc146f501963f5414017ba80d781210ef
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
2012-12-21 08:46:37 +01:00
Yuchen Deng b94b5531b0 Add doc/qtqml and doc/qtquick to .gitignore
Change-Id: I17fa26d5d1481318656b45776f38c3699e873718
Reviewed-by: Gunnar Sletta <gunnar.sletta@nokia.com>
2012-08-28 12:11:27 +02:00
Oswald Buddenhagen ad5ee12241 nicer gitignore
Change-Id: I6e7afb77c98060c2968aa2fd7ede2435117205e3
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-07-10 19:51:29 +02:00
Kent Hansen 35dd4cbd3d Remove QtDeclarative compatibility module
When the QtDeclarative module was renamed to QtQml, a compatibility
module was introduced to avoid disrupting downstream projects.
Time has passed, and it's now appropriate to remove this module.

Existing projects that haven't ported can still use the
bin/rename-qtdeclarative-symbols.sh script to ease the porting.

Change-Id: I05a9727013d9e38c2262577f68260a4382bfbeea
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Matthew Vogt <matthew.vogt@nokia.com>
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Reviewed-by: Donald Carr <donald.carr@nokia.com>
2012-05-14 10:12:24 +02:00
Yuchen Deng c79ad1f30f Add some ignore rules to ignore list
Change-Id: I7953e503d5665aaccf87ca4fe8b1b4169bfae5c8
Reviewed-by: Aaron Kennedy <aaron.kennedy@nokia.com>
2012-05-03 18:48:06 +02:00
Alan Alpert 9d2b618fa0 Start of examples refactor
This is the general reorg of the examples directory structure, plus additional
guidelines.

calculator, animations and accessibility have been updated to the new standards
and tested, as an example.

Task-number: QTBUG-24133
Change-Id: I76c3b86751d3195ba2a5474ff23afb875765e9a4
Reviewed-by: Alan Alpert <alan.alpert@nokia.com>
2012-02-24 10:24:58 +01:00
Charles Yin a44a99b3fa update .gitignore
Change-Id: I7bb60aaadf2ca2153e8e76bba092dba753e9cf2c
Reviewed-by: Michael Brasser <michael.brasser@nokia.com>
Reviewed-by: Yunqiao Yin <charles.yin@nokia.com>
2012-02-02 09:09:37 +01:00
Charles Yin e073343971 update .gitignore
Change-Id: I9265922f9c34437e712ff3e8033458daf202fe56
Reviewed-on: http://codereview.qt.nokia.com/3345
Reviewed-by: Charles Yin <charles.yin@nokia.com>
2011-08-25 01:58:03 +02:00
Jason McDonald 038776e2aa Remove obsolete testlib files from .gitignore
Change-Id: Id68d91dcf6c6d980e59aeb97ab9f8a57ffedb7b4
Reviewed-on: http://codereview.qt.nokia.com/3369
Reviewed-by: Qt Sanity Bot <qt_sanity_bot@ovi.com>
Reviewed-by: Rohan McGovern <rohan.mcgovern@nokia.com>
2011-08-23 10:49:44 +02:00
Liang Qi 14b8b7d3de Add QTDECLARATIVE_VERSION macro for qtdeclarative
Provide version info for each library.

Task-number: QTMODULARIZATION-44
Reviewed-by: axis
2011-05-11 13:21:07 +02:00
axis 10991179a6 Add .gitignore to each module 2011-04-27 12:06:07 +02:00