summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJordan Justen <[email protected]>2014-05-15 06:06:47 +0000
committerJordan Justen <[email protected]>2014-05-15 10:49:05 -0700
commit103057b2b7c0cf26c28b40fe5802acb8c6195c77 (patch)
tree0d6e49aeb84724b3bddbca73b56142708ac751f6
parent255357f79b6bfba1583346a77f0bfa7cfc174883 (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 <[email protected]> Reviewed-by: Kenneth Graunke <[email protected]> Cc: "10.2" <[email protected]>
-rw-r--r--src/mesa/drivers/dri/i965/brw_meta_updownsample.c3
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;