Skip to content

Commit

Permalink
OPENGL: Slight formatting fixes.
Browse files Browse the repository at this point in the history
  • Loading branch information
Johannes Schickel committed Feb 15, 2012
1 parent 864eec8 commit beab93e
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions backends/graphics/opengl/gltexture.cpp
Expand Up @@ -11,7 +11,7 @@
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* You should have received a copy of the GNU General Public License
Expand Down Expand Up @@ -60,8 +60,8 @@ void GLTexture::initGLExtensions() {
return;

// Get a string with all extensions
const char* ext_string =
reinterpret_cast<const char*>(glGetString(GL_EXTENSIONS));
const char *ext_string =
reinterpret_cast<const char *>(glGetString(GL_EXTENSIONS));
CHECK_GL_ERROR();
Common::StringTokenizer tokenizer(ext_string, " ");
// Iterate all string tokens
Expand Down Expand Up @@ -132,7 +132,7 @@ void GLTexture::allocBuffer(GLuint w, GLuint h) {

// Allocate room for the texture
glTexImage2D(GL_TEXTURE_2D, 0, _internalFormat,
_textureWidth, _textureHeight, 0, _glFormat, _glType, NULL); CHECK_GL_ERROR();
_textureWidth, _textureHeight, 0, _glFormat, _glType, NULL); CHECK_GL_ERROR();

_refresh = false;
}
Expand All @@ -148,13 +148,13 @@ void GLTexture::updateBuffer(const void *buf, int pitch, GLuint x, GLuint y, GLu
// Check if the buffer has its data contiguously
if (static_cast<int>(w) * _bytesPerPixel == pitch) {
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h,
_glFormat, _glType, buf); CHECK_GL_ERROR();
_glFormat, _glType, buf); CHECK_GL_ERROR();
} else {
// Update the texture row by row
const byte *src = static_cast<const byte *>(buf);
do {
glTexSubImage2D(GL_TEXTURE_2D, 0, x, y,
w, 1, _glFormat, _glType, src); CHECK_GL_ERROR();
w, 1, _glFormat, _glType, src); CHECK_GL_ERROR();
++y;
src += pitch;
} while (--h);
Expand Down

0 comments on commit beab93e

Please sign in to comment.