Signed-off-by: Anuj Phogat <anuj.pho...@gmail.com>
---
src/mesa/drivers/dri/i965/intel_tex_image.c | 8 --------
src/mesa/drivers/dri/i965/intel_tex_subimage.c | 7 -------
2 files changed, 15 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c
b/src/mesa/drivers/dri/i965/intel_tex_image.c
index 8e845c6..00ccbe0 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -96,7 +96,6 @@ intelTexImage(struct gl_context * ctx,
struct brw_context *brw = brw_context(ctx);
bool ok;
bool create_pbo = false;
- uint32_t tr_mode = INTEL_MIPTREE_TRMODE_NONE;
bool tex_busy = intelImage->mt && drm_intel_bo_busy(intelImage->mt->bo);
DBG("%s mesa_format %s target %s format %s type %s level %d %dx%dx%d\n",
@@ -114,8 +113,6 @@ intelTexImage(struct gl_context * ctx,
assert(intelImage->mt);
if (brw->gen >= 9) {
- tr_mode = intelImage->mt->tr_mode;
-
/* Set create_pbo = true for surfaces with INTEL_MIPTREE_TRMODE_{YF/YS}.
* _mesa_meta_pbo_TexSubImage() is the only working path to upload data
* to such surfaces.
@@ -135,11 +132,6 @@ intelTexImage(struct gl_context * ctx,
if (ok)
return;
- /* Currently there are no fallback paths to upload data to surfaces with
- * tr_mode != INTEL_MIPTREE_TRMODE_NONE.
- */
- assert(tr_mode == INTEL_MIPTREE_TRMODE_NONE);
-
ok = intel_texsubimage_tiled_memcpy(ctx, dims, texImage,
0, 0, 0, /*x,y,z offsets*/
texImage->Width,
diff --git a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
index a7ad10e..6b3b78f 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_subimage.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_subimage.c
@@ -203,7 +203,6 @@ intelTexSubImage(struct gl_context * ctx,
struct brw_context *brw = brw_context(ctx);
bool ok;
bool create_pbo = false;
- uint32_t tr_mode = INTEL_MIPTREE_TRMODE_NONE;
bool tex_busy = intelImage->mt && drm_intel_bo_busy(intelImage->mt->bo);
DBG("%s mesa_format %s target %s format %s type %s level %d %dx%dx%d\n",
@@ -213,7 +212,6 @@ intelTexSubImage(struct gl_context * ctx,
texImage->Level, texImage->Width, texImage->Height, texImage->Depth);
if (brw->gen >= 9) {
- tr_mode = intelImage->mt->tr_mode;
/* Set create_pbo = true for surfaces with INTEL_MIPTREE_TRMODE_{YF/YS}.
* _mesa_meta_pbo_TexSubImage() is the only working path to upload data
* to such surfaces.
@@ -231,11 +229,6 @@ intelTexSubImage(struct gl_context * ctx,
if (ok)
return;
- /* Currently there are no fallback paths to upload data to surfaces with
- * tr_mode != INTEL_MIPTREE_TRMODE_NONE.
- */
- assert(tr_mode == INTEL_MIPTREE_TRMODE_NONE);
-
ok = intel_texsubimage_tiled_memcpy(ctx, dims, texImage,
xoffset, yoffset, zoffset,
width, height, depth,
--
2.3.4
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
