thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MORPHOS : Fixed for int vs int32 types for AmigaOS/MorphOS (#2510)

Browse source 
MORPHOS : Fixed int to int32 and some functions not available on AmigaOS/MorphOS
This commit is contained in:
BeWorld 2020-10-11 18:24:36 +02:00 • committed by GitHub
parent 15119e2ca0
commit cab7cd49c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 34 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

15
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
View file

@ -213,8 +213,10 @@ void BaseRenderOpenGL3D::displayShadow(BaseObject *object, const Math::Vector3d
glEnable(GL_TEXTURE_2D);
static_cast<BaseSurfaceOpenGL3D *>(shadowImage)->setTexture();
#ifndef __MORPHOS__
glInterleavedArrays(GL_T2F_N3F_V3F, 0, _simpleShadow);
#endif
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
glDepthMask(true);
@ -476,7 +478,7 @@ bool BaseRenderOpenGL3D::setup2D(bool force) {
#if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
glActiveTexturePtr(GL_TEXTURE0);
#else
glActiveTexture(GL_TEXTURE0);
glActiveTextureARB(GL_TEXTURE0);
#endif
glTexEnvf(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_COMBINE);
glTexEnvf(GL_TEXTURE_ENV, GL_COMBINE_RGB, GL_MODULATE);
@ -489,16 +491,16 @@ bool BaseRenderOpenGL3D::setup2D(bool force) {
#if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
glActiveTexturePtr(GL_TEXTURE1);
#else
glActiveTexture(GL_TEXTURE1);
glActiveTextureARB(GL_TEXTURE1);
#endif
glDisable(GL_TEXTURE_2D);
#if defined(__MINGW32__) && defined (SDL_BACKEND) && !defined(USE_GLEW)
glActiveTexturePtr(GL_TEXTURE0);
#else
glActiveTexture(GL_TEXTURE0);
glActiveTextureARB(GL_TEXTURE0);
#endif
glViewport(0, 0, _width, _height);
setProjection2D();
}
@ -722,7 +724,10 @@ bool BaseRenderOpenGL3D::drawSpriteEx(BaseSurfaceOpenGL3D &tex, const Wintermute
glEnableClientState(GL_VERTEX_ARRAY);
glEnableClientState(GL_TEXTURE_COORD_ARRAY);
#ifndef __MORPHOS__
glInterleavedArrays(GL_T2F_C4UB_V3F, 0, vertices);
#endif
glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
if (alphaDisable) {