i965/i915: Add colorspace support to YUV sampling

[mesa.git] / src / mesa / drivers / dri / i965 / intel_tex_image.c

diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index fba925dee5aaab971e032e6762baa3bb17cd3cc4..c0a4a9c2ca9163364830fe1201266f37c393a35c 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -208,7 +208,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
        !(texImage->TexObject->Target == GL_TEXTURE_2D ||
          texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||
        pixels == NULL ||
-       _mesa_is_bufferobj(packing->BufferObj) ||
+       packing->BufferObj ||
        packing->Alignment > 4 ||
        packing->SkipPixels > 0 ||
        packing->SkipRows > 0 ||
@@ -322,12 +322,13 @@ intel_upload_tex(struct gl_context * ctx,
    bool ok;
 
    /* Check that there is actually data to store. */
-   if (pixels == NULL && !_mesa_is_bufferobj(packing->BufferObj))
+   if (pixels == NULL && !packing->BufferObj)
       return;
 
-   bool tex_busy = mt && brw_bo_busy(mt->bo);
+   bool tex_busy = mt &&
+      (brw_batch_references(&brw->batch, mt->bo) || brw_bo_busy(mt->bo));
 
-   if (_mesa_is_bufferobj(packing->BufferObj) || tex_busy ||
+   if (packing->BufferObj || tex_busy ||
        mt->aux_usage == ISL_AUX_USAGE_CCS_E) {
       ok = intel_texsubimage_blorp(brw, dims, texImage,
                                    xoffset, yoffset, zoffset,
@@ -633,6 +634,7 @@ intel_image_target_texture(struct gl_context *ctx, GLenum target,
 
    struct intel_texture_object *intel_texobj = intel_texture_object(texObj);
    intel_texobj->planar_format = image->planar_format;
+   intel_texobj->yuv_color_space = image->yuv_color_space;
 
    GLenum internal_format =
       image->internal_format != 0 ?
@@ -755,7 +757,7 @@ intel_gettexsubimage_tiled_memcpy(struct gl_context *ctx,
        !(texImage->TexObject->Target == GL_TEXTURE_2D ||
          texImage->TexObject->Target == GL_TEXTURE_RECTANGLE) ||
        pixels == NULL ||
-       _mesa_is_bufferobj(packing->BufferObj) ||
+       packing->BufferObj ||
        packing->Alignment > 4 ||
        packing->SkipPixels > 0 ||
        packing->SkipRows > 0 ||
@@ -866,7 +868,7 @@ intel_get_tex_sub_image(struct gl_context *ctx,
 
    DBG("%s\n", __func__);
 
-   if (_mesa_is_bufferobj(ctx->Pack.BufferObj)) {
+   if (ctx->Pack.BufferObj) {
       if (intel_gettexsubimage_blorp(brw, texImage,
                                      xoffset, yoffset, zoffset,
                                      width, height, depth, format, type,