More changes to painter

This commit is contained in:
Henrique Santiago
2013-02-22 03:31:13 -03:00
parent 3eeb5ae890
commit 90d2032e9e
18 changed files with 31 additions and 127 deletions

View File

@@ -23,16 +23,16 @@
#include "fontmanager.h"
#if OPENGL_ES==2
#include "painterogl2.h"
#include "ogl/painterogl2.h"
#elif OPENGL_ES==1
#include "painterogl1.h"
#include "ogl/painterogl1.h"
#else
#include "painterogl1.h"
#include "painterogl2.h"
#include "ogl/painterogl1.h"
#include "ogl/painterogl2.h"
#endif
#if defined(WIN32) && defined(DIRECTX)
#include "painterdx9.h"
#include "dx/painterdx9.h"
#endif
#include <framework/graphics/graphics.h>
@@ -184,8 +184,8 @@ bool Graphics::isPainterEngineAvailable(Graphics::PainterEngine painterEngine)
bool Graphics::selectPainterEngine(PainterEngine painterEngine)
{
PainterOGL *painter = nullptr;
PainterOGL *fallbackPainter = nullptr;
Painter *painter = nullptr;
Painter *fallbackPainter = nullptr;
PainterEngine fallbackPainterEngine = Painter_Any;
#ifdef PAINTER_DX9