Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MORPHOS : fix somes Warning and glGetString #2531

Merged
merged 23 commits into from
Oct 16, 2020
Merged

MORPHOS : fix somes Warning and glGetString #2531

Show file tree
Hide file tree
Changes from 19 commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
fd0ca91
Merge pull request #1 from scummvm/master
BeWorld2018 Oct 11, 2020
7af37fa
WINTERMUTE / MORPHOS : fix int to int32 and somes functions not avail…
BeWorld2018 Oct 11, 2020
375de38
WINTERMUTE : mission one conversion int to int32
BeWorld2018 Oct 11, 2020
7da873b
MORPHOS : fix Myst3 glTexSubImage2D
BeWorld2018 Oct 11, 2020
20a2639
MORPHOS : fix glCallLists
BeWorld2018 Oct 11, 2020
b4f8095
MORPHOS : add platform support
BeWorld2018 Oct 11, 2020
3240718
MORPHOS : add platform support
BeWorld2018 Oct 11, 2020
9a70e22
MORPHOS : cast fix glTexSubImage2D
BeWorld2018 Oct 11, 2020
1bf90ea
Merge pull request #2 from scummvm/master
BeWorld2018 Oct 11, 2020
c670b54
Update texture.cpp
BeWorld2018 Oct 11, 2020
7e9eeb6
Update gfx_opengl.cpp
BeWorld2018 Oct 11, 2020
dac5ef8
Update gfx_opengl_texture.cpp
BeWorld2018 Oct 11, 2020
8a5d19b
Update base_surface_opengl3d.cpp
BeWorld2018 Oct 11, 2020
cae226f
Update base_render_opengl3d.cpp
BeWorld2018 Oct 11, 2020
f26ee3e
Add MorphOS support
BeWorld2018 Oct 11, 2020
ae0579a
Update gfx_opengl.cpp
BeWorld2018 Oct 11, 2020
7132cec
Merge pull request #3 from scummvm/master
BeWorld2018 Oct 11, 2020
96f67a3
Merge pull request #4 from scummvm/master
BeWorld2018 Oct 12, 2020
e314a8f
MORPHOS : fix somes Warning and glGetString
BeWorld2018 Oct 12, 2020
58906e2
Merge remote-tracking branch 'upstream/master'
BeWorld2018 Oct 16, 2020
223f541
Update openglsdl-graphics3d.cpp
BeWorld2018 Oct 16, 2020
e6b1365
COMMON : rename D to DL
BeWorld2018 Oct 16, 2020
b6e0f92
Update streamdebug.h
BeWorld2018 Oct 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions backends/graphics3d/openglsdl/openglsdl-graphics3d.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,23 @@ void OpenGLSdlGraphics3dManager::setupScreen() {
int glflag;
const GLubyte *str;

#ifdef __MORPHOS__
BeWorld2018 marked this conversation as resolved.
Show resolved Hide resolved
str = (GLubyte*)glGetString(GL_VENDOR);
#else
str = glGetString(GL_VENDOR);
#endif
debug("INFO: OpenGL Vendor: %s", str);
#ifdef __MORPHOS__
str = (GLubyte*)glGetString(GL_RENDERER);
#else
str = glGetString(GL_RENDERER);
#endif
debug("INFO: OpenGL Renderer: %s", str);
#ifdef __MORPHOS__
str = (GLubyte*)glGetString(GL_VERSION);
#else
str = glGetString(GL_VERSION);
#endif
debug("INFO: OpenGL Version: %s", str);
SDL_GL_GetAttribute(SDL_GL_RED_SIZE, &glflag);
debug("INFO: OpenGL Red bits: %d", glflag);
Expand Down
4 changes: 4 additions & 0 deletions common/ptr.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,10 @@
#include "common/safe-bool.h"
#include "common/types.h"

#ifdef __MORPHOS__
#undef D
BeWorld2018 marked this conversation as resolved.
Show resolved Hide resolved
#endif

namespace Common {

/**
Expand Down
4 changes: 4 additions & 0 deletions common/streamdebug.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,10 @@
#ifndef COMMON_STREAMDEBUG_H
#define COMMON_STREAMDEBUG_H

#ifdef __MORPHOS__
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug is on Common namespace, what is a warning here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Debug, i have this.. i think it's specific MorphOS
image

#undef Debug
#endif

namespace Common {

class String;
Expand Down