Mesa (master): intel: Simplify renderbuffer-for-texture width setup.
Eric Anholt
anholt at kemper.freedesktop.org
Mon May 6 22:05:16 UTC 2013
Module: Mesa
Branch: master
Commit: 5b190d19d326369a5c43fbdd1f19d9c8d112da40
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5b190d19d326369a5c43fbdd1f19d9c8d112da40
Author: Eric Anholt <eric at anholt.net>
Date: Mon Apr 22 11:07:59 2013 -0700
intel: Simplify renderbuffer-for-texture width setup.
We're looking for the logical width of our level, which is what
image->Width2/Height2 is. The previous code relied on MSAA textures being
only level 0.
Reviewed-by: Kenneth Graunke <kenneth at whitecape.org>
---
src/mesa/drivers/dri/intel/intel_fbo.c | 13 ++-----------
1 files changed, 2 insertions(+), 11 deletions(-)
diff --git a/src/mesa/drivers/dri/intel/intel_fbo.c b/src/mesa/drivers/dri/intel/intel_fbo.c
index caecd3f..241695f 100644
--- a/src/mesa/drivers/dri/intel/intel_fbo.c
+++ b/src/mesa/drivers/dri/intel/intel_fbo.c
@@ -493,17 +493,8 @@ intel_renderbuffer_update_wrapper(struct intel_context *intel,
rb->InternalFormat = image->InternalFormat;
rb->_BaseFormat = image->_BaseFormat;
rb->NumSamples = mt->num_samples;
-
- if (mt->msaa_layout != INTEL_MSAA_LAYOUT_NONE) {
- assert(level == 0);
- rb->Width = mt->logical_width0;
- rb->Height = mt->logical_height0;
- }
- else {
- rb->Width = mt->level[level].width;
- rb->Height = mt->level[level].height;
- }
-
+ rb->Width = image->Width2;
+ rb->Height = image->Height2;
rb->Delete = intel_delete_renderbuffer;
rb->AllocStorage = intel_nop_alloc_storage;
More information about the mesa-commit
mailing list