Merge "update parameters in uploadToTexture() for GLES20"