diff options
| author | Jordi Vilalta Prat | 2010-12-03 19:16:23 +0000 |
|---|---|---|
| committer | Jordi Vilalta Prat | 2010-12-03 19:16:23 +0000 |
| commit | f1d961a35eadec6a76c0423563e379d830f68002 (patch) | |
| tree | c182bb52f096c42d3ff2a69b259ac2d7563d7914 /backends | |
| parent | bd6f33380ecc8ab78012292e3a1b5ddb0c448c82 (diff) | |
| download | scummvm-rg350-f1d961a35eadec6a76c0423563e379d830f68002.tar.gz scummvm-rg350-f1d961a35eadec6a76c0423563e379d830f68002.tar.bz2 scummvm-rg350-f1d961a35eadec6a76c0423563e379d830f68002.zip | |
OPENGL: Some slight formatting fixes.
svn-id: r54755
Diffstat (limited to 'backends')
| -rw-r--r-- | backends/graphics/opengl/glerrorcheck.cpp | 12 | ||||
| -rw-r--r-- | backends/graphics/opengl/gltexture.cpp | 8 | ||||
| -rw-r--r-- | backends/graphics/opengl/opengl-graphics.h | 10 |
3 files changed, 15 insertions, 15 deletions
diff --git a/backends/graphics/opengl/glerrorcheck.cpp b/backends/graphics/opengl/glerrorcheck.cpp index 782cb92f85..3abcc27eed 100644 --- a/backends/graphics/opengl/glerrorcheck.cpp +++ b/backends/graphics/opengl/glerrorcheck.cpp @@ -49,12 +49,12 @@ static const char *getGlErrStr(GLenum error) { switch (error) { - case GL_NO_ERROR: return "GL_NO_ERROR"; - case GL_INVALID_ENUM: return "GL_INVALID_ENUM"; - case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; - case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; - case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; - case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; + case GL_NO_ERROR: return "GL_NO_ERROR"; + case GL_INVALID_ENUM: return "GL_INVALID_ENUM"; + case GL_INVALID_OPERATION: return "GL_INVALID_OPERATION"; + case GL_STACK_OVERFLOW: return "GL_STACK_OVERFLOW"; + case GL_STACK_UNDERFLOW: return "GL_STACK_UNDERFLOW"; + case GL_OUT_OF_MEMORY: return "GL_OUT_OF_MEMORY"; } // FIXME: Convert to use Common::String::format() diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp index a76fc3d9e6..843ec2d2b3 100644 --- a/backends/graphics/opengl/gltexture.cpp +++ b/backends/graphics/opengl/gltexture.cpp @@ -177,10 +177,10 @@ void GLTexture::drawTexture(GLshort x, GLshort y, GLshort w, GLshort h) { // Calculate the screen rect where the texture will be drawn const GLshort vertices[] = { - x, y, - x + w, y, - x, y + h, - x + w, y + h, + x, y, + x + w, y, + x, y + h, + x + w, y + h, }; glVertexPointer(2, GL_SHORT, 0, vertices); CHECK_GL_ERROR(); diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h index 9b3340aef2..81c7202bed 100644 --- a/backends/graphics/opengl/opengl-graphics.h +++ b/backends/graphics/opengl/opengl-graphics.h @@ -46,7 +46,7 @@ enum { } /** - * Open GL graphics manager. This is an abstract class, it does not do the + * OpenGL graphics manager. This is an abstract class, it does not do the * window and OpenGL context initialization. * Derived classes should at least override internUpdateScreen for doing * the buffers swap, and implement loadGFXMode for handling the window/context if @@ -89,7 +89,7 @@ public: virtual void fillScreen(uint32 col); virtual void updateScreen(); virtual void setShakePos(int shakeOffset); - virtual void setFocusRectangle(const Common::Rect& rect); + virtual void setFocusRectangle(const Common::Rect &rect); virtual void clearFocusRectangle(); virtual void showOverlay(); @@ -203,7 +203,7 @@ protected: // // Game screen // - GLTexture* _gameTexture; + GLTexture *_gameTexture; Graphics::Surface _screenData; int _screenChangeCount; bool _screenNeedsRedraw; @@ -222,7 +222,7 @@ protected: // // Overlay // - GLTexture* _overlayTexture; + GLTexture *_overlayTexture; Graphics::Surface _overlayData; Graphics::PixelFormat _overlayFormat; bool _overlayVisible; @@ -256,7 +256,7 @@ protected: vHotX(0), vHotY(0) {} }; - GLTexture* _cursorTexture; + GLTexture *_cursorTexture; Graphics::Surface _cursorData; Graphics::PixelFormat _cursorFormat; byte *_cursorPalette; |