← Back to branch summary

~ubuntu-branches/ubuntu/trusty/manaplus/trusty-proposed

« back to all changes in this revision

Viewing changes to src/resources/openglimagehelper.cpp

  • Committer: Package Import Robot
  • Author(s): Patrick Matthäi
  • Date: 2013-09-17 10:35:51 UTC
  • mfrom: (1.1.10)
  • Revision ID: package-import@ubuntu.com-20130917103551-az7p3nz9jgxwqjfn
Tags: 1.3.9.15-1
New upstream release.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/resources/openglimagehelper.cpp
29
29
#include "graphicsmanager.h"
30
30
#include "logger.h"
31
31
#include "mgl.h"
32
 
#include "mobileopenglgraphics.h"
33
 
#include "normalopenglgraphics.h"
34
 
#include "safeopenglgraphics.h"
 
32
 
 
33
#include "render/mobileopenglgraphics.h"
 
34
#include "render/normalopenglgraphics.h"
 
35
#include "render/renderers.h"
 
36
#include "render/safeopenglgraphics.h"
35
37
 
36
38
#include "resources/dye.h"
37
39
#include "resources/image.h"
48
50
int OpenGLImageHelper::mInternalTextureType = GL_RGBA8;
49
51
int OpenGLImageHelper::mTextureSize = 0;
50
52
bool OpenGLImageHelper::mBlur = true;
51
 
int OpenGLImageHelper::mUseOpenGL = 0;
52
53
bool OpenGLImageHelper::mUseTextureSampler = false;
53
54
 
54
55
Image *OpenGLImageHelper::load(SDL_RWops *const rw, Dye const &dye) const
199
200
    switch (mUseOpenGL)
200
201
    {
201
202
#ifndef ANDROID
202
 
        case 1:
 
203
        case RENDER_NORMAL_OPENGL:
203
204
            NormalOpenGLGraphics::bindTexture(mTextureType, texture);
204
205
            break;
205
 
        case 2:
 
206
        case RENDER_SAFE_OPENGL:
206
207
            SafeOpenGLGraphics::bindTexture(mTextureType, texture);
207
208
            break;
208
209
#else
209
 
        case 1:
210
 
        case 2:
 
210
        case RENDER_NORMAL_OPENGL:
 
211
        case RENDER_SAFE_OPENGL:
211
212
#endif
212
 
        case 3:
 
213
        case RENDER_GLES_OPENGL:
213
214
            MobileOpenGLGraphics::bindTexture(mTextureType, texture);
214
215
            break;
 
216
        case RENDER_SOFTWARE:
 
217
        case RENDER_SDL2_DEFAULT:
 
218
        case RENDER_NULL:
 
219
        case RENDER_LAST:
215
220
        default:
216
221
            logger->log("Unknown OpenGL backend: %d", mUseOpenGL);
217
222
            break;
275
280
    return new Image(texture, width, height, realWidth, realHeight);
276
281
}
277
282
 
278
 
void OpenGLImageHelper::setLoadAsOpenGL(const int useOpenGL)
279
 
{
280
 
    OpenGLImageHelper::mUseOpenGL = useOpenGL;
281
 
}
282
 
 
283
 
int OpenGLImageHelper::useOpenGL() const
284
 
{
285
 
    return mUseOpenGL;
286
 
}
287
 
 
288
283
void OpenGLImageHelper::initTextureSampler(const GLint id)
289
284
{
290
285
    if (mBlur)