diff options
author | Louai Al-Khanji <louai.al-khanji@digia.com> | 2013-12-04 13:40:23 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2014-01-10 15:10:29 +0100 |
commit | b9362903b339e57362a7a3296904504521d0e26f (patch) | |
tree | ea5f735c17d958fa00f7cf46e40e86be10ed0e26 /src/gui | |
parent | 5a2fc4c367d4645ae3350fdcfb6c1bbd0e9c1a97 (diff) |
Add new direct2d platform plugin
This is an alternative plugin for the windows platform. It shares most
code with the current windows plugin, but substitutes a direct2d-based
paint engine for window backing stores and pixmaps.
Change-Id: I78fafd9c5871fa090b49436f5b40ec80f8789f8b
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/gui')
-rw-r--r-- | src/gui/image/qplatformpixmap.h | 3 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine.cpp | 1 | ||||
-rw-r--r-- | src/gui/painting/qpaintengine.h | 1 |
3 files changed, 4 insertions, 1 deletions
diff --git a/src/gui/image/qplatformpixmap.h b/src/gui/image/qplatformpixmap.h index 81125bdec4..435811eb84 100644 --- a/src/gui/image/qplatformpixmap.h +++ b/src/gui/image/qplatformpixmap.h @@ -69,7 +69,8 @@ public: }; enum ClassId { RasterClass, DirectFBClass, - BlitterClass, CustomClass = 1024 }; + BlitterClass, Direct2DClass, + CustomClass = 1024 }; QPlatformPixmap(PixelType pixelType, int classId); virtual ~QPlatformPixmap(); diff --git a/src/gui/painting/qpaintengine.cpp b/src/gui/painting/qpaintengine.cpp index f1eaea0f6b..acab08e794 100644 --- a/src/gui/painting/qpaintengine.cpp +++ b/src/gui/painting/qpaintengine.cpp @@ -387,6 +387,7 @@ void QPaintEngine::drawPolygon(const QPoint *points, int pointCount, PolygonDraw \value OpenGL2 \value PaintBuffer \value Blitter + \value Direct2D Windows only, Direct2D based engine */ /*! diff --git a/src/gui/painting/qpaintengine.h b/src/gui/painting/qpaintengine.h index 18b6d84146..7b928ba5f6 100644 --- a/src/gui/painting/qpaintengine.h +++ b/src/gui/painting/qpaintengine.h @@ -207,6 +207,7 @@ public: OpenGL2, PaintBuffer, Blitter, + Direct2D, User = 50, // first user type id MaxUser = 100 // last user type id |