diff options
| author | Willem Jan Palenstijn | 2011-08-22 08:53:42 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-08-22 08:57:06 +0200 |
| commit | 4f748884bc48cea7d92b7c28b53744a9a92c2f0c (patch) | |
| tree | f5b942cc6a4ea5bda64f125b0aa7ab76d7b058d5 /backends/graphics | |
| parent | ae19be062824c7e17632d2c4da7ba5c2f4624095 (diff) | |
| parent | c39b7491e6a23450ae0dc41ca6f3c3b06ed91c2e (diff) | |
| download | scummvm-rg350-4f748884bc48cea7d92b7c28b53744a9a92c2f0c.tar.gz scummvm-rg350-4f748884bc48cea7d92b7c28b53744a9a92c2f0c.tar.bz2 scummvm-rg350-4f748884bc48cea7d92b7c28b53744a9a92c2f0c.zip | |
Merge pull request #67 from chrisws/initial-bada-port-master
This is the initial implementation of the BADA port.
Diffstat (limited to 'backends/graphics')
| -rw-r--r-- | backends/graphics/opengl/gltexture.h | 5 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.cpp | 6 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 6 |
3 files changed, 15 insertions, 2 deletions
diff --git a/backends/graphics/opengl/gltexture.h b/backends/graphics/opengl/gltexture.h index 2f0bef2bbf..71f1eeb78f 100644 --- a/backends/graphics/opengl/gltexture.h +++ b/backends/graphics/opengl/gltexture.h @@ -44,7 +44,10 @@ #define ARRAYSIZE(x) ((int)(sizeof(x) / sizeof(x[0]))) #endif -#if defined(USE_GLES) +#if defined(BADA) +#include <FGraphicsOpengl.h> +using namespace Osp::Graphics::Opengl; +#elif defined(USE_GLES) #include <GLES/gl.h> #elif defined(SDL_BACKEND) #include <SDL_opengl.h> diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp index 40ef17e477..8e01e76f16 100644 --- a/backends/graphics/opengl/opengl-graphics.cpp +++ b/backends/graphics/opengl/opengl-graphics.cpp @@ -1348,9 +1348,13 @@ const char *OpenGLGraphicsManager::getCurrentModeName() { } #ifdef USE_OSD +const Graphics::Font *OpenGLGraphicsManager::getFontOSD() { + return FontMan.getFontByUsage(Graphics::FontManager::kLocalizedFont); +} + void OpenGLGraphicsManager::updateOSD() { // The font we are going to use: - const Graphics::Font *font = FontMan.getFontByUsage(Graphics::FontManager::kLocalizedFont); + const Graphics::Font *font = getFontOSD(); if (_osdSurface.w != _osdTexture->getWidth() || _osdSurface.h != _osdTexture->getHeight()) _osdSurface.create(_osdTexture->getWidth(), _osdTexture->getHeight(), _overlayFormat); diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 42cfbacc85..6ded680eae 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -27,6 +27,7 @@ #include "backends/graphics/graphics.h" #include "common/array.h" #include "common/rect.h" +#include "graphics/font.h" #include "graphics/pixelformat.h" // Uncomment this to enable the 'on screen display' code. @@ -315,6 +316,11 @@ protected: */ Common::Array<Common::String> _osdLines; + /** + * Returns the font used for on screen display + */ + virtual const Graphics::Font *getFontOSD(); + /** * Update the OSD texture / surface. */ |