X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fintel%2Fintel_tex_validate.c;h=eaa25617bab38b93d1db7d8e1f43e7a3029dbe02;hb=bdf13dc8324c391b7d34f8bdaea72c4452ab7edb;hp=748fbdca2b90c781b15749902efa3a050baf3729;hpb=d7b33309fe160212f2eb73f471f3aedcb5d0b5c1;p=mesa.git diff --git a/src/mesa/drivers/dri/intel/intel_tex_validate.c b/src/mesa/drivers/dri/intel/intel_tex_validate.c index 748fbdca2b9..eaa25617bab 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_validate.c +++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c @@ -1,6 +1,7 @@ #include "main/mtypes.h" #include "main/macros.h" #include "main/samplerobj.h" +#include "main/texobj.h" #include "intel_context.h" #include "intel_mipmap_tree.h" @@ -20,12 +21,18 @@ intel_update_max_level(struct intel_texture_object *intelObj, struct gl_sampler_object *sampler) { struct gl_texture_object *tObj = &intelObj->base; + int maxlevel; if (sampler->MinFilter == GL_NEAREST || sampler->MinFilter == GL_LINEAR) { - intelObj->_MaxLevel = tObj->BaseLevel; + maxlevel = tObj->BaseLevel; } else { - intelObj->_MaxLevel = tObj->_MaxLevel; + maxlevel = tObj->_MaxLevel; + } + + if (intelObj->_MaxLevel != maxlevel) { + intelObj->_MaxLevel = maxlevel; + intelObj->needs_validate = true; } } @@ -43,17 +50,24 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) struct intel_texture_image *firstImage; int width, height, depth; + /* TBOs require no validation -- they always just point to their BO. */ + if (tObj->Target == GL_TEXTURE_BUFFER) + return true; + /* We know/require this is true by now: */ - assert(intelObj->base._Complete); + assert(intelObj->base._BaseComplete); /* What levels must the tree include at a minimum? */ intel_update_max_level(intelObj, sampler); - firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]); + if (intelObj->mt && intelObj->mt->first_level != tObj->BaseLevel) + intelObj->needs_validate = true; + + if (!intelObj->needs_validate) + return true; - intel_miptree_get_dimensions_for_image(&firstImage->base.Base, - &width, &height, &depth); + firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]); /* Check tree can hold all active levels. Check tree matches * target, imageFormat, etc. @@ -64,13 +78,9 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) * of that, we just always relayout on baselevel change. */ if (intelObj->mt && - (intelObj->mt->target != intelObj->base.Target || - intelObj->mt->format != firstImage->base.Base.TexFormat || + (!intel_miptree_match_image(intelObj->mt, &firstImage->base.Base) || intelObj->mt->first_level != tObj->BaseLevel || - intelObj->mt->last_level < intelObj->_MaxLevel || - intelObj->mt->width0 != width || - intelObj->mt->height0 != height || - intelObj->mt->depth0 != depth)) { + intelObj->mt->last_level < intelObj->_MaxLevel)) { intel_miptree_release(&intelObj->mt); } @@ -78,6 +88,14 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) /* May need to create a new tree: */ if (!intelObj->mt) { + intel_miptree_get_dimensions_for_image(&firstImage->base.Base, + &width, &height, &depth); + + perf_debug("Creating new %s %dx%dx%d %d..%d miptree to handle finalized " + "texture miptree.\n", + _mesa_get_format_name(firstImage->base.Base.TexFormat), + width, height, depth, tObj->BaseLevel, intelObj->_MaxLevel); + intelObj->mt = intel_miptree_create(intel, intelObj->base.Target, firstImage->base.Base.TexFormat, @@ -86,14 +104,16 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) width, height, depth, - true); + true, + 0 /* num_samples */, + false /* force_y_tiling */); if (!intelObj->mt) return false; } /* Pull in any images not in the object's tree: */ - nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; + nr_faces = _mesa_num_tex_faces(intelObj->base.Target); for (face = 0; face < nr_faces; face++) { for (i = tObj->BaseLevel; i <= intelObj->_MaxLevel; i++) { struct intel_texture_image *intelImage = @@ -101,118 +121,21 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) /* skip too small size mipmap */ if (intelImage == NULL) break; - /* Need to import images in main memory or held in other trees. - * If it's a render target, then its data isn't needed to be in - * the object tree (otherwise we'd be FBO incomplete), and we need - * to keep track of the image's MT as needing to be pulled in still, - * or we'll lose the rendering that's done to it. - */ - if (intelObj->mt != intelImage->mt && - !intelImage->used_as_render_target) { - intel_miptree_copy_teximage(intel, intelImage, intelObj->mt); - } - } - } - - return true; -} - -/** - * \param mode bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT - */ -static void -intel_tex_map_image_for_swrast(struct intel_context *intel, - struct intel_texture_image *intel_image, - GLbitfield mode) -{ - int level; - int face; - struct intel_mipmap_tree *mt; - unsigned int x, y; - - if (!intel_image || !intel_image->mt) - return; - - level = intel_image->base.Base.Level; - face = intel_image->base.Base.Face; - mt = intel_image->mt; - - if (mt->target == GL_TEXTURE_3D || - mt->target == GL_TEXTURE_2D_ARRAY || - mt->target == GL_TEXTURE_1D_ARRAY) { - int i; - - /* ImageOffsets[] is only used for swrast's fetch_texel_3d, so we can't - * share code with the normal path. - */ - for (i = 0; i < mt->level[level].depth; i++) { - intel_miptree_get_image_offset(mt, level, face, i, &x, &y); - intel_image->base.ImageOffsets[i] = x + y * mt->region->pitch; - } - - DBG("%s \n", __FUNCTION__); - - intel_image->base.Data = intel_region_map(intel, mt->region, mode); - } else { - assert(intel_image->base.Base.Depth == 1); - intel_miptree_get_image_offset(mt, level, face, 0, &x, &y); - DBG("%s: (%d,%d) -> (%d, %d)/%d\n", - __FUNCTION__, face, level, x, y, mt->region->pitch * mt->cpp); - - intel_image->base.Data = intel_region_map(intel, mt->region, mode) + - (x + y * mt->region->pitch) * mt->cpp; - } - - intel_image->base.RowStride = mt->region->pitch; -} - -static void -intel_tex_unmap_image_for_swrast(struct intel_context *intel, - struct intel_texture_image *intel_image) -{ - if (intel_image && intel_image->mt) { - intel_region_unmap(intel, intel_image->mt->region); - intel_image->base.Data = NULL; - } -} - -/** - * \param mode bitmask of GL_MAP_READ_BIT, GL_MAP_WRITE_BIT - */ -void -intel_tex_map_images(struct intel_context *intel, - struct intel_texture_object *intelObj, - GLbitfield mode) -{ - GLuint nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; - int i, face; - - DBG("%s\n", __FUNCTION__); - - for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) { - for (face = 0; face < nr_faces; face++) { - struct intel_texture_image *intel_image = - intel_texture_image(intelObj->base.Image[face][i]); + if (intelObj->mt != intelImage->mt) { + intel_miptree_copy_teximage(intel, intelImage, intelObj->mt, + false /* invalidate */); + } - intel_tex_map_image_for_swrast(intel, intel_image, mode); + /* After we're done, we'd better agree that our layout is + * appropriate, or we'll end up hitting this function again on the + * next draw + */ + assert(intel_miptree_match_image(intelObj->mt, &intelImage->base.Base)); } } -} -void -intel_tex_unmap_images(struct intel_context *intel, - struct intel_texture_object *intelObj) -{ - GLuint nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; - int i, face; - - for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) { - for (face = 0; face < nr_faces; face++) { - struct intel_texture_image *intel_image = - intel_texture_image(intelObj->base.Image[face][i]); + intelObj->needs_validate = false; - intel_tex_unmap_image_for_swrast(intel, intel_image); - } - } + return true; }