Commit 3352f2d7 authored by Kristian Høgsberg Kristensen's avatar Kristian Høgsberg Kristensen Committed by Kristian Høgsberg Kristensen

i965: Create multiple miptrees for planar YUV images

Reviewed-by: Jordan Justen's avatarJordan Justen <jordan.l.justen@intel.com>
parent 6eede876
...@@ -1026,6 +1026,9 @@ intel_miptree_release(struct intel_mipmap_tree **mt) ...@@ -1026,6 +1026,9 @@ intel_miptree_release(struct intel_mipmap_tree **mt)
intel_miptree_release(&(*mt)->mcs_mt); intel_miptree_release(&(*mt)->mcs_mt);
intel_resolve_map_clear(&(*mt)->hiz_map); intel_resolve_map_clear(&(*mt)->hiz_map);
intel_miptree_release(&(*mt)->plane[0]);
intel_miptree_release(&(*mt)->plane[1]);
for (i = 0; i < MAX_TEXTURE_LEVELS; i++) { for (i = 0; i < MAX_TEXTURE_LEVELS; i++) {
free((*mt)->level[i].slice); free((*mt)->level[i].slice);
} }
......
...@@ -624,6 +624,11 @@ struct intel_mipmap_tree ...@@ -624,6 +624,11 @@ struct intel_mipmap_tree
*/ */
struct intel_mipmap_tree *mcs_mt; struct intel_mipmap_tree *mcs_mt;
/**
* Planes 1 and 2 in case this is a planar surface.
*/
struct intel_mipmap_tree *plane[2];
/** /**
* Fast clear state for this buffer. * Fast clear state for this buffer.
*/ */
......
...@@ -162,6 +162,47 @@ intel_set_texture_image_mt(struct brw_context *brw, ...@@ -162,6 +162,47 @@ intel_set_texture_image_mt(struct brw_context *brw,
intel_miptree_reference(&intel_texobj->mt, mt); intel_miptree_reference(&intel_texobj->mt, mt);
} }
static struct intel_mipmap_tree *
create_mt_for_planar_dri_image(struct brw_context *brw,
GLenum target, __DRIimage *image)
{
struct intel_image_format *f = image->planar_format;
struct intel_mipmap_tree *planar_mt;
for (int i = 0; i < f->nplanes; i++) {
const int index = f->planes[i].buffer_index;
const uint32_t dri_format = f->planes[i].dri_format;
const mesa_format format = driImageFormatToGLFormat(dri_format);
const uint32_t width = image->width >> f->planes[i].width_shift;
const uint32_t height = image->height >> f->planes[i].height_shift;
/* Disable creation of the texture's aux buffers because the driver
* exposes no EGL API to manage them. That is, there is no API for
* resolving the aux buffer's content to the main buffer nor for
* invalidating the aux buffer's content.
*/
struct intel_mipmap_tree *mt =
intel_miptree_create_for_bo(brw, image->bo, format,
image->offsets[index],
width, height, 1,
image->strides[index],
MIPTREE_LAYOUT_DISABLE_AUX);
if (mt == NULL)
return NULL;
mt->target = target;
mt->total_width = width;
mt->total_height = height;
if (i == 0)
planar_mt = mt;
else
planar_mt->plane[i - 1] = mt;
}
return planar_mt;
}
/** /**
* Binds a BO to a texture image, as if it was uploaded by glTexImage2D(). * Binds a BO to a texture image, as if it was uploaded by glTexImage2D().
* *
...@@ -348,7 +389,10 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target, ...@@ -348,7 +389,10 @@ intel_image_target_texture_2d(struct gl_context *ctx, GLenum target,
return; return;
} }
mt = create_mt_for_dri_image(brw, target, image); if (image->planar_format && image->planar_format->nplanes > 0)
mt = create_mt_for_planar_dri_image(brw, target, image);
else
mt = create_mt_for_dri_image(brw, target, image);
if (mt == NULL) if (mt == NULL)
return; return;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment