<div dir="ltr"><div>Patches 1 and 2 are<br><br></div>Reviewed-by: Jason Ekstrand <<a href="mailto:jason.ekstrand@intel.com">jason.ekstrand@intel.com</a>><br></div><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Dec 22, 2014 at 3:08 PM, Neil Roberts <span dir="ltr"><<a href="mailto:neil@linux.intel.com" target="_blank">neil@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">This should just be a simple case of adding the skip values to the src offset<br>
so we can trivially implement it.<br>
---<br>
 src/mesa/drivers/dri/i965/intel_tex_image.c | 7 ++++++-<br>
 1 file changed, 6 insertions(+), 1 deletion(-)<br>
<br>
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c<br>
index 52ee97e..b1b49b9 100644<br>
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c<br>
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c<br>
@@ -105,7 +105,7 @@ intel_try_pbo_upload(struct gl_context *ctx,<br>
<br>
    DBG("trying pbo upload\n");<br>
<br>
-   if (ctx->_ImageTransferState || unpack->SkipPixels || unpack->SkipRows) {<br>
+   if (ctx->_ImageTransferState) {<br>
       DBG("%s: image transfer\n", __FUNCTION__);<br>
       return false;<br>
    }<br>
@@ -137,6 +137,11 @@ intel_try_pbo_upload(struct gl_context *ctx,<br>
<br>
    /* note: potential 64-bit ptr to 32-bit int cast */<br>
    src_offset = (GLuint) (unsigned long) pixels;<br>
+   src_offset += _mesa_image_offset(2,<br>
+                                    unpack,<br>
+                                    width, height,<br>
+                                    format, type,<br>
+                                    0, 0, 0 /* img/row/column */);<br>
    src_buffer = intel_bufferobj_buffer(brw, pbo,<br>
                                        src_offset, src_stride * height);<br>
<span class="HOEnZb"><font color="#888888"><br>
--<br>
1.9.3<br>
<br>
_______________________________________________<br>
mesa-dev mailing list<br>
<a href="mailto:mesa-dev@lists.freedesktop.org">mesa-dev@lists.freedesktop.org</a><br>
<a href="http://lists.freedesktop.org/mailman/listinfo/mesa-dev" target="_blank">http://lists.freedesktop.org/mailman/listinfo/mesa-dev</a><br>
</font></span></blockquote></div><br></div>