From f23599fa5b6ae36c52455ea021472d18897c4e0c Mon Sep 17 00:00:00 2001 From: Topi Pohjolainen Date: Thu, 29 Jun 2017 17:03:01 +0300 Subject: [PATCH] i965/miptree: Add pitch override for imported buffer objects Reviewed-by: Jason Ekstrand Signed-off-by: Topi Pohjolainen --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c index cefe33f84b9..59833f89631 100644 --- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c @@ -738,7 +738,7 @@ make_surface(struct brw_context *brw, GLenum target, mesa_format format, unsigned width0, unsigned height0, unsigned depth0, unsigned num_samples, enum isl_tiling isl_tiling, isl_surf_usage_flags_t isl_usage_flags, uint32_t alloc_flags, - struct brw_bo *bo) + unsigned row_pitch, struct brw_bo *bo) { struct intel_mipmap_tree *mt = calloc(sizeof(*mt), 1); if (!mt) @@ -772,6 +772,7 @@ make_surface(struct brw_context *brw, GLenum target, mesa_format format, .levels = last_level - first_level + 1, .array_len = target == GL_TEXTURE_3D ? 1 : depth0, .samples = MAX2(num_samples, 1), + .row_pitch = row_pitch, .usage = isl_usage_flags, .tiling_flags = 1u << isl_tiling }; @@ -822,7 +823,7 @@ miptree_create(struct brw_context *brw, width0, height0, depth0, num_samples, ISL_TILING_W, ISL_SURF_USAGE_STENCIL_BIT | ISL_SURF_USAGE_TEXTURE_BIT, - BO_ALLOC_FOR_RENDER, NULL); + BO_ALLOC_FOR_RENDER, 0, NULL); struct intel_mipmap_tree *mt; mesa_format tex_format = format; @@ -946,7 +947,7 @@ intel_miptree_create_for_bo(struct brw_context *brw, 0, 0, width, height, depth, 1, ISL_TILING_W, ISL_SURF_USAGE_STENCIL_BIT | ISL_SURF_USAGE_TEXTURE_BIT, - BO_ALLOC_FOR_RENDER, bo); + BO_ALLOC_FOR_RENDER, pitch, bo); if (!mt) return NULL;