Mesa (master): i965/tex_subimage: Use the fast tiled path for rectangle textures

[Jason Ekstrand]

Module: Mesa
Branch: master
Commit: f883aac06ee9f609273722772b7dd15debaf4f11
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=f883aac06ee9f609273722772b7dd15debaf4f11

Author: Jason Ekstrand <jason.ekstrand at intel.com>
Date:   Fri Jan  2 18:22:04 2015 -0800

i965/tex_subimage: Use the fast tiled path for rectangle textures

There's no reason why we should be doing this for 2D textures and not
rectangles.  Just a matter of adding another hunk to the condition.

Signed-off-by: Jason Ekstrand <jason.ekstrand at intel.com>
Reviewed-by: Chad Versace <chad.versace at intel.com>

---

 src/mesa/drivers/dri/i965/intel_tex_subimage.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index b96ad50..1c6310f 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -467,7 +467,8 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
     */
    if (!brw->has_llc ||
        !(type == GL_UNSIGNED_BYTE || type == GL_UNSIGNED_INT_8_8_8_8_REV) ||
-       texImage->TexObject->Target != GL_TEXTURE_2D ||
+       !(texImage->TexObject->Target == GL_TEXTURE_2D ||
+         texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||
        pixels == NULL ||
        _mesa_is_bufferobj(packing->BufferObj) ||
        packing->Alignment > 4 ||