[Scummvm-cvs-logs] scummvm master -> d81bb9794f59787ced1edde4c867aa307cec68fb

lordhoto lordhoto at gmail.com
Thu Feb 24 17:11:49 CET 2011


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
d81bb9794f OPENGL: Prefer single operation texture updates.


Commit: d81bb9794f59787ced1edde4c867aa307cec68fb
    https://github.com/scummvm/scummvm/commit/d81bb9794f59787ced1edde4c867aa307cec68fb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2011-02-24T08:10:49-08:00

Commit Message:
OPENGL: Prefer single operation texture updates.

When doing glTexSubImage2D we do not need to assure that the source data has
the same width as the texture when we want to update the data, we just need
to assure that the width * Bpp cound matches the pitch.

Changed paths:
    backends/graphics/opengl/gltexture.cpp



diff --git a/backends/graphics/opengl/gltexture.cpp b/backends/graphics/opengl/gltexture.cpp
index cd9e23c..7b7d40f 100644
--- a/backends/graphics/opengl/gltexture.cpp
+++ b/backends/graphics/opengl/gltexture.cpp
@@ -149,7 +149,7 @@ void GLTexture::updateBuffer(const void *buf, int pitch, GLuint x, GLuint y, GLu
 	glBindTexture(GL_TEXTURE_2D, _textureName); CHECK_GL_ERROR();
 
 	// Check if the buffer has its data contiguously
-	if (static_cast<int>(w) * _bytesPerPixel == pitch && w == _textureWidth) {
+	if (static_cast<int>(w) * _bytesPerPixel == pitch) {
 		glTexSubImage2D(GL_TEXTURE_2D, 0, x, y, w, h,
 						_glFormat, _glType, buf); CHECK_GL_ERROR();
 	} else {






More information about the Scummvm-git-logs mailing list