#include "main/mtypes.h"
#include "main/macros.h"
#include "main/samplerobj.h"
+#include "main/teximage.h"
#include "main/texobj.h"
#include "brw_context.h"
#include "intel_mipmap_tree.h"
-#include "intel_blit.h"
#include "intel_tex.h"
#define FILE_DEBUG_FLAG DEBUG_TEXTURE
* allow sampling beyond level 0.
*/
static void
-intel_update_max_level(struct intel_texture_object *intelObj,
+intel_update_max_level(struct gl_texture_object *tObj,
struct gl_sampler_object *sampler)
{
- struct gl_texture_object *tObj = &intelObj->base;
+ struct intel_texture_object *intelObj = intel_texture_object(tObj);
if (!tObj->_MipmapComplete ||
(tObj->_RenderToTexture &&
* BaseLevel/MaxLevel/filtering, and copy in any texture images that are
* stored in other miptrees.
*/
-GLuint
-intel_finalize_mipmap_tree(struct brw_context *brw, GLuint unit)
+void
+intel_finalize_mipmap_tree(struct brw_context *brw,
+ struct gl_texture_object *tObj)
{
- struct gl_context *ctx = &brw->ctx;
- struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
struct intel_texture_object *intelObj = intel_texture_object(tObj);
- struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
GLuint face, i;
GLuint nr_faces = 0;
struct intel_texture_image *firstImage;
/* TBOs require no validation -- they always just point to their BO. */
if (tObj->Target == GL_TEXTURE_BUFFER)
- return true;
-
- /* We know that this is true by now, and if it wasn't, we might have
- * mismatched level sizes and the copies would fail.
- */
- assert(intelObj->base._BaseComplete);
-
- intel_update_max_level(intelObj, sampler);
+ return;
/* What levels does this validated texture image require? */
int validate_first_level = tObj->BaseLevel;
if (!intelObj->needs_validate &&
validate_first_level >= intelObj->validated_first_level &&
validate_last_level <= intelObj->validated_last_level) {
- return true;
+ return;
}
/* On recent generations, immutable textures should not get this far
*
* FINISHME: Avoid doing this.
*/
- assert(!tObj->Immutable || brw->gen < 6);
+ assert(!tObj->Immutable || brw->screen->devinfo.gen < 6);
firstImage = intel_texture_image(tObj->Image[0][tObj->BaseLevel]);
/* May need to create a new tree:
*/
if (!intelObj->mt) {
- intel_miptree_get_dimensions_for_image(&firstImage->base.Base,
- &width, &height, &depth);
-
+ const unsigned level = firstImage->base.Base.Level;
+ intel_get_image_dims(&firstImage->base.Base, &width, &height, &depth);
+ /* Figure out image dimensions at start level. */
+ switch(intelObj->base.Target) {
+ case GL_TEXTURE_2D_MULTISAMPLE:
+ case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
+ case GL_TEXTURE_RECTANGLE:
+ case GL_TEXTURE_EXTERNAL_OES:
+ assert(level == 0);
+ break;
+ case GL_TEXTURE_3D:
+ depth = depth << level;
+ /* Fall through */
+ case GL_TEXTURE_2D:
+ case GL_TEXTURE_2D_ARRAY:
+ case GL_TEXTURE_CUBE_MAP:
+ case GL_TEXTURE_CUBE_MAP_ARRAY:
+ height = height << level;
+ /* Fall through */
+ case GL_TEXTURE_1D:
+ case GL_TEXTURE_1D_ARRAY:
+ width = width << level;
+ break;
+ default:
+ unreachable("Unexpected target");
+ }
perf_debug("Creating new %s %dx%dx%d %d-level miptree to handle "
"finalized texture miptree.\n",
_mesa_get_format_name(firstImage->base.Base.TexFormat),
width, height, depth, validate_last_level + 1);
- const uint32_t layout_flags = MIPTREE_LAYOUT_ACCELERATED_UPLOAD |
- MIPTREE_LAYOUT_ALLOC_ANY_TILED;
intelObj->mt = intel_miptree_create(brw,
intelObj->base.Target,
firstImage->base.Base.TexFormat,
width,
height,
depth,
- 0 /* num_samples */,
- layout_flags);
+ 1 /* num_samples */,
+ MIPTREE_CREATE_BUSY);
if (!intelObj->mt)
- return false;
+ return;
}
/* Pull in any images not in the object's tree:
if (intelImage == NULL)
break;
- if (intelObj->mt != intelImage->mt) {
- intel_miptree_copy_teximage(brw, intelImage, intelObj->mt,
- false /* invalidate */);
- }
+ if (intelObj->mt != intelImage->mt)
+ intel_miptree_copy_teximage(brw, intelImage, intelObj->mt);
/* After we're done, we'd better agree that our layout is
* appropriate, or we'll end up hitting this function again on the
intelObj->validated_first_level = validate_first_level;
intelObj->validated_last_level = validate_last_level;
- intelObj->_Format = intelObj->mt->format;
+ intelObj->_Format = firstImage->base.Base.TexFormat,
intelObj->needs_validate = false;
+}
+
+/**
+ * Finalizes all textures, completing any rendering that needs to be done
+ * to prepare them.
+ */
+void
+brw_validate_textures(struct brw_context *brw)
+{
+ struct gl_context *ctx = &brw->ctx;
+ const int max_enabled_unit = ctx->Texture._MaxEnabledTexImageUnit;
+
+ for (int unit = 0; unit <= max_enabled_unit; unit++) {
+ struct gl_texture_object *tex_obj = ctx->Texture.Unit[unit]._Current;
- return true;
+ if (!tex_obj)
+ continue;
+
+ struct gl_sampler_object *sampler = _mesa_get_samplerobj(ctx, unit);
+
+ /* We know that this is true by now, and if it wasn't, we might have
+ * mismatched level sizes and the copies would fail.
+ */
+ assert(tex_obj->_BaseComplete);
+
+ intel_update_max_level(tex_obj, sampler);
+ intel_finalize_mipmap_tree(brw, tex_obj);
+ }
}
projects / mesa.git / blobdiff