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=31ac689ad770581c89213c8ec9456b03e4ff4a6e;hpb=7dae1aaf142999e3cfeafb13d30abda667d66d87;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 31ac689ad77..eaa25617bab 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_validate.c +++ b/src/mesa/drivers/dri/intel/intel_tex_validate.c @@ -1,10 +1,13 @@ #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" +#include "intel_blit.h" #include "intel_tex.h" +#include "intel_tex_layout.h" #define FILE_DEBUG_FLAG DEBUG_TEXTURE @@ -14,60 +17,25 @@ * but BaseLevel. */ static void -intel_update_max_level(struct intel_context *intel, - struct intel_texture_object *intelObj, +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; } -} -/** - * Copies the image's contents at its level into the object's miptree, - * and updates the image to point at the object's miptree. - */ -static void -copy_image_data_to_tree(struct intel_context *intel, - struct intel_texture_object *intelObj, - struct intel_texture_image *intelImage) -{ - if (intelImage->mt) { - /* Copy potentially with the blitter: - */ - intel_miptree_image_copy(intel, - intelObj->mt, - intelImage->base.Face, - intelImage->base.Level, intelImage->mt); - - intel_miptree_release(intel, &intelImage->mt); - } - else { - assert(intelImage->base.Data != NULL); - - /* More straightforward upload. - */ - intel_miptree_image_data(intel, - intelObj->mt, - intelImage->base.Face, - intelImage->base.Level, - intelImage->base.Data, - intelImage->base.RowStride, - intelImage->base.RowStride * - intelImage->base.Height); - _mesa_align_free(intelImage->base.Data); - intelImage->base.Data = NULL; + if (intelObj->_MaxLevel != maxlevel) { + intelObj->_MaxLevel = maxlevel; + intelObj->needs_validate = true; } - - intel_miptree_reference(&intelImage->mt, intelObj->mt); } - /* */ GLuint @@ -80,24 +48,26 @@ intel_finalize_mipmap_tree(struct intel_context *intel, GLuint unit) GLuint face, i; GLuint nr_faces = 0; 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(intel, intelObj, sampler); - firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]); + intel_update_max_level(intelObj, sampler); + if (intelObj->mt && intelObj->mt->first_level != tObj->BaseLevel) + intelObj->needs_validate = true; - /* Fallback case: - */ - if (firstImage->base.Border) { - if (intelObj->mt) { - intel_miptree_release(intel, &intelObj->mt); - } - return GL_FALSE; - } + if (!intelObj->needs_validate) + return true; + + firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]); /* Check tree can hold all active levels. Check tree matches * target, imageFormat, etc. @@ -108,36 +78,42 @@ 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.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 != firstImage->base.Width || - intelObj->mt->height0 != firstImage->base.Height || - intelObj->mt->depth0 != firstImage->base.Depth)) { - intel_miptree_release(intel, &intelObj->mt); + intelObj->mt->last_level < intelObj->_MaxLevel)) { + intel_miptree_release(&intelObj->mt); } /* 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.TexFormat, + firstImage->base.Base.TexFormat, tObj->BaseLevel, intelObj->_MaxLevel, - firstImage->base.Width, - firstImage->base.Height, - firstImage->base.Depth, - GL_TRUE); + width, + height, + depth, + true, + 0 /* num_samples */, + false /* force_y_tiling */); if (!intelObj->mt) - return GL_FALSE; + 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 = @@ -145,86 +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) { - copy_image_data_to_tree(intel, intelObj, intelImage); - } - } - } - return GL_TRUE; -} - -void -intel_tex_map_level_images(struct intel_context *intel, - struct intel_texture_object *intelObj, - int level) -{ - GLuint nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; - GLuint face; - - for (face = 0; face < nr_faces; face++) { - struct intel_texture_image *intelImage = - intel_texture_image(intelObj->base.Image[face][level]); - - if (intelImage && intelImage->mt) { - intelImage->base.Data = - intel_miptree_image_map(intel, - intelImage->mt, - intelImage->base.Face, - intelImage->base.Level, - &intelImage->base.RowStride, - intelImage->base.ImageOffsets); - /* convert stride to texels, not bytes */ - intelImage->base.RowStride /= intelImage->mt->cpp; - /* intelImage->base.ImageStride /= intelImage->mt->cpp; */ - } - } -} - -void -intel_tex_unmap_level_images(struct intel_context *intel, - struct intel_texture_object *intelObj, - int level) -{ - GLuint nr_faces = (intelObj->base.Target == GL_TEXTURE_CUBE_MAP) ? 6 : 1; - GLuint face; - - for (face = 0; face < nr_faces; face++) { - struct intel_texture_image *intelImage = - intel_texture_image(intelObj->base.Image[face][level]); + if (intelObj->mt != intelImage->mt) { + intel_miptree_copy_teximage(intel, intelImage, intelObj->mt, + false /* invalidate */); + } - if (intelImage && intelImage->mt) { - intel_miptree_image_unmap(intel, intelImage->mt); - intelImage->base.Data = NULL; + /* 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_map_images(struct intel_context *intel, - struct intel_texture_object *intelObj) -{ - int i; - - DBG("%s\n", __FUNCTION__); - for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) - intel_tex_map_level_images(intel, intelObj, i); -} - -void -intel_tex_unmap_images(struct intel_context *intel, - struct intel_texture_object *intelObj) -{ - int i; + intelObj->needs_validate = false; - for (i = intelObj->base.BaseLevel; i <= intelObj->_MaxLevel; i++) - intel_tex_unmap_level_images(intel, intelObj, i); + return true; }