diff options
author | Eric Anholt <[email protected]> | 2013-05-30 09:43:45 -0700 |
---|---|---|
committer | Eric Anholt <[email protected]> | 2013-06-03 13:47:18 -0700 |
commit | f96de8ad9622d42ce54feedd246967c73d1206cd (patch) | |
tree | 4debab72d02e573b8c58d5f27f27b4db983de8d2 | |
parent | 610fe6da7909c96ae8fa85d93ece5c2e5c2d729b (diff) |
intel: Fix performance regression from miptree blit changes.
When making v2 of da2880bea05bfc87109477ab026a7f5401fc8f0c, I carefully
checked all of the calls in that commit to see that I'd updated them, but
forgot to update the new calls in the later commits such as
.e845c5cf7abce55759501a473459aff3bf25c9ca. As a result, we were getting Y
tiled temporaries even though the whole point of the temporary was to
untile!
The steady state of the intro scene of lightsmark goes from 13 to 17 fps.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=65154
Reviewed-by: Chad Versace <[email protected]>
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_mipmap_tree.c | 2 | ||||
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_tex_subimage.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c index e5fc4258fb5..c336c46c36d 100644 --- a/src/mesa/drivers/dri/intel/intel_mipmap_tree.c +++ b/src/mesa/drivers/dri/intel/intel_mipmap_tree.c @@ -1502,7 +1502,7 @@ intel_miptree_map_blit(struct intel_context *intel, 0, 0, map->w, map->h, 1, false, 0, - (1 << I915_TILING_NONE)); + INTEL_MIPTREE_TILING_NONE); if (!map->mt) { fprintf(stderr, "Failed to allocate blit temporary\n"); goto fail; diff --git a/src/mesa/drivers/dri/intel/intel_tex_subimage.c b/src/mesa/drivers/dri/intel/intel_tex_subimage.c index 834288ba2b1..bd178bbe498 100644 --- a/src/mesa/drivers/dri/intel/intel_tex_subimage.c +++ b/src/mesa/drivers/dri/intel/intel_tex_subimage.c @@ -91,8 +91,7 @@ intel_blit_texsubimage(struct gl_context * ctx, intel_miptree_create(intel, GL_TEXTURE_2D, texImage->TexFormat, 0, 0, width, height, 1, - false, 0, - (1 << I915_TILING_NONE) /* force_tiling_mask */); + false, 0, INTEL_MIPTREE_TILING_NONE); if (!temp_mt) goto err; |