diff options
| author | Jordan Justen <jordan.l.justen@intel.com> | 2014-05-15 06:06:47 +0000 |
|---|---|---|
| committer | Ian Romanick <ian.d.romanick@intel.com> | 2014-05-16 23:26:58 -0700 |
| commit | f5848ec2e411961559a0792822e3479e45357fc2 (patch) | |
| tree | 86f95dc7478ef8b90553c14af916b1805021b74b | |
| parent | 79a34441d5756dca0977eb6b80df94d4ede9f73f (diff) | |
i965 meta up/downsample: Fix renderbuffer _BaseFormat
mt->format is of type mesa_format, and therefore can't be
used with _mesa_base_fbo_format which requires a GLenum input.
On gen8, this fixes various piglit fbo-depthstencil tests with
samples > 1.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>
Cc: "10.2" <mesa-stable@lists.freedesktop.org>
(cherry picked from commit 103057b2b7c0cf26c28b40fe5802acb8c6195c77)
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_meta_updownsample.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c index de25bf4f7aa..a35b7e14f61 100644 --- a/src/mesa/drivers/dri/i965/brw_meta_updownsample.c +++ b/src/mesa/drivers/dri/i965/brw_meta_updownsample.c @@ -27,6 +27,7 @@ #include "main/blit.h" #include "main/buffers.h" +#include "main/enums.h" #include "main/fbobject.h" #include "drivers/common/meta.h" @@ -62,7 +63,7 @@ brw_get_rb_for_first_slice(struct brw_context *brw, struct intel_mipmap_tree *mt irb = intel_renderbuffer(rb); rb->Format = mt->format; - rb->_BaseFormat = _mesa_base_fbo_format(ctx, mt->format); + rb->_BaseFormat = _mesa_get_format_base_format(mt->format); rb->NumSamples = mt->num_samples; rb->Width = mt->logical_width0; |