diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-18 14:49:15 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-07-27 12:12:34 +0000 |
| commit | ede3791df8330ed8daae6667d025ad40219a9f5f (patch) | |
| tree | 0f0c8d8897799b6a7f56c381fe36701795f28f6c /src/gui/opengl/opengl.pri | |
| parent | 318b15db15b515675b0b1e7b3319c793b9f1a757 (diff) | |
Move texture uploading out of QOpenGLTextureCache
This way the logic can be reused elsewhere.
At the same time a standard OpenGL ES/3 way of handling BGRA is added,
so we don't depend on extensions, and handling of NPOT and max size
which QSGTexture will need.
Change-Id: I475bc7127f44be3964fdb482c9e86a20db1fbca5
Reviewed-by: Laszlo Agocs <laszlo.agocs@qt.io>
Diffstat (limited to 'src/gui/opengl/opengl.pri')
| -rw-r--r-- | src/gui/opengl/opengl.pri | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/opengl/opengl.pri b/src/gui/opengl/opengl.pri index 4c778b184e..24758afdeb 100644 --- a/src/gui/opengl/opengl.pri +++ b/src/gui/opengl/opengl.pri @@ -32,6 +32,7 @@ qtConfig(opengl) { opengl/qopengltexture.h \ opengl/qopengltexture_p.h \ opengl/qopengltexturehelper_p.h \ + opengl/qopengltextureuploader_p.h \ opengl/qopenglpixeltransferoptions.h \ opengl/qopenglextrafunctions.h \ opengl/qopenglprogrambinarycache_p.h @@ -56,6 +57,7 @@ qtConfig(opengl) { opengl/qopengltextureblitter.cpp \ opengl/qopengltexture.cpp \ opengl/qopengltexturehelper.cpp \ + opengl/qopengltextureuploader.cpp \ opengl/qopenglpixeltransferoptions.cpp \ opengl/qopenglprogrambinarycache.cpp |