Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e614aeaf authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change Ide4c8cbc into eclair 

* changes:
  fix [2151588] glTexSubImage2D() allows pixel format conversion
parents 5694da94 d13e4615

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);