summaryrefslogtreecommitdiffstats
path: root/src/scenegraph/coreapi/qsgcontext.cpp
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@nokia.com>2010-12-20 15:12:29 +0100
committerGunnar Sletta <gunnar.sletta@nokia.com>2010-12-20 15:12:29 +0100
commit4fd7a1c816a2105f93c2bd28055920da792f1ce1 (patch)
tree321d855ff0ea27d3e45fd08c54a45e31253b9755 /src/scenegraph/coreapi/qsgcontext.cpp
parente9365b6bb7c73ba5e696581e13ff47a204502014 (diff)
got partial uploader working
Diffstat (limited to 'src/scenegraph/coreapi/qsgcontext.cpp')
-rw-r--r--src/scenegraph/coreapi/qsgcontext.cpp14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/scenegraph/coreapi/qsgcontext.cpp b/src/scenegraph/coreapi/qsgcontext.cpp
index 152452c..a52bd95 100644
--- a/src/scenegraph/coreapi/qsgcontext.cpp
+++ b/src/scenegraph/coreapi/qsgcontext.cpp
@@ -8,6 +8,7 @@
#include "default/default_glyphnode.h"
#include "qsgtexturemanager.h"
+#include "qsgpartialuploadtexturemanager.h"
#include <QApplication>
@@ -184,10 +185,15 @@ QSGTextureManager *QSGContext::createTextureManager()
QSGTextureManager *manager;
-// if (args.contains("--basic-texture-manager")) {
-// printf("QSGContext: Using basic texture manager\n");
- manager = new QSGTextureManager;
-// } else if (args.contains("--threaded-texture-manager")) {
+// if (args.contains("--partial-texture-manager")) {
+// printf("QSGContext: Using partial upload texture manager\n");
+ manager = new QSGPartialUploadTextureManager;
+// } else {
+// printf("QSGContext: Using basic texture manager\n");
+// manager = new QSGTextureManager;
+// }
+
+ // } else if (args.contains("--threaded-texture-manager")) {
// printf("QSGContext: Using threaded texture manager\n");
// return new QSGThreadedTextureManager;
// }