MYST3: Removed dependency on openGL
This commit is contained in:
parent
3d9c432478
commit
d05bfb30b7
5 changed files with 10 additions and 8 deletions
5
configure
vendored
5
configure
vendored
|
@ -4237,11 +4237,6 @@ if test `get_engine_build myst3` = yes && test ! "$_bink" = yes ; then
|
||||||
engine_disable myst3
|
engine_disable myst3
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if test `get_engine_build myst3` = yes && test ! "$_opengl" = yes ; then
|
|
||||||
echo "...disabling Myst 3 engine. OpenGL is required"
|
|
||||||
engine_disable myst3
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#
|
#
|
||||||
# Figure out installation directories
|
# Figure out installation directories
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
#include "common/rect.h"
|
#include "common/rect.h"
|
||||||
#include "common/textconsole.h"
|
#include "common/textconsole.h"
|
||||||
|
|
||||||
#if !defined(USE_GLES2) && !defined(USE_OPENGL_SHADERS)
|
#if defined(USE_OPENGL) && !defined(USE_GLES2) && !defined(USE_OPENGL_SHADERS)
|
||||||
|
|
||||||
#include "graphics/colormasks.h"
|
#include "graphics/colormasks.h"
|
||||||
#include "graphics/surface.h"
|
#include "graphics/surface.h"
|
||||||
|
|
|
@ -36,7 +36,6 @@
|
||||||
* all copies or substantial portions of the Software.
|
* all copies or substantial portions of the Software.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#if defined(WIN32)
|
#if defined(WIN32)
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
// winnt.h defines ARRAYSIZE, but we want our own one...
|
// winnt.h defines ARRAYSIZE, but we want our own one...
|
||||||
|
|
|
@ -20,6 +20,10 @@
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
#include "common/scummsys.h"
|
||||||
|
|
||||||
|
#if defined(USE_OPENGL) || defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
|
||||||
|
|
||||||
#include "engines/myst3/gfx_opengl_texture.h"
|
#include "engines/myst3/gfx_opengl_texture.h"
|
||||||
|
|
||||||
namespace Myst3 {
|
namespace Myst3 {
|
||||||
|
@ -83,3 +87,5 @@ void OpenGLTexture::update(const Graphics::Surface *surface) {
|
||||||
}
|
}
|
||||||
|
|
||||||
} // end of namespace Myst3
|
} // end of namespace Myst3
|
||||||
|
|
||||||
|
#endif
|
||||||
|
|
|
@ -156,8 +156,10 @@ Common::Error Myst3Engine::run() {
|
||||||
} else {
|
} else {
|
||||||
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
|
#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
|
||||||
_gfx = CreateGfxOpenGLShader(_system);
|
_gfx = CreateGfxOpenGLShader(_system);
|
||||||
#else
|
#elif defined(USE_OPENGL)
|
||||||
_gfx = CreateGfxOpenGL(_system);
|
_gfx = CreateGfxOpenGL(_system);
|
||||||
|
#else
|
||||||
|
_gfx = CreateGfxTinyGL(_system);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
_sound = new Sound(this);
|
_sound = new Sound(this);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue