Commit edd3ac3a authored Oct 19, 2009 by Mathias Agopian Committed by Android Git Automerger Oct 19, 2009

am 3662f9ee: Merge change Ide4c8cbc into eclair

Merge commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c' into eclair-mr2

* commit '3662f9ee5be3113b57693e1495fd83a2f5c7200c':
  fix [2151588] glTexSubImage2D() allows pixel format conversion

parents 980a23ab e614aeaf

opengl/libagl/texture.cpp

+5 −0

Original line number	Diff line number	Diff line
		@@ -1252,6 +1252,11 @@ void glTexSubImage2D(
		ogles_error(c, GL_INVALID_OPERATION);
		return;
		}

		if (format != tex->internalformat) {
		ogles_error(c, GL_INVALID_OPERATION);
		return;
		}
		if ((xoffset + width > GLsizei(surface.width)) \|\|
		(yoffset + height > GLsizei(surface.height))) {
		ogles_error(c, GL_INVALID_VALUE);