Mesa (master): i965: Fix context initialization after 2f896627175384fd5
Eric Anholt
anholt at kemper.freedesktop.org
Wed Nov 6 00:07:47 UTC 2013
Module: Mesa
Branch: master
Commit: 3f319eef76a31776085accb38c06851bc04f64b8
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=3f319eef76a31776085accb38c06851bc04f64b8
Author: Eric Anholt <eric at anholt.net>
Date: Mon Nov 4 15:49:52 2013 -0800
i965: Fix context initialization after 2f896627175384fd5
You can't return stack-initialized values and expect anything good to
happen.
Reviewed-by: Chad Versace <chad.versace at linux.intel.com
Reviewed-by: Matt Turner <mattst88 at gmail.com>
---
src/mesa/drivers/dri/i965/brw_context.c | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 1f4fbbf..ab420fb 100644
--- a/src/mesa/drivers/dri/i965/brw_context.c
+++ b/src/mesa/drivers/dri/i965/brw_context.c
@@ -275,12 +275,15 @@ brw_init_driver_functions(struct brw_context *brw,
static const int*
brw_supported_msaa_modes(const struct brw_context *brw)
{
+ static const int gen7_samples[] = {8, 4, 0};
+ static const int gen6_samples[] = {4, 0};
+ static const int gen4_samples[] = {0};
if (brw->gen >= 7) {
- return (int[]){8, 4, 0};
+ return gen7_samples;
} else if (brw->gen == 6) {
- return (int[]){4, 0};
+ return gen6_samples;
} else {
- return (int[]){0};
+ return gen4_samples;
}
}
More information about the mesa-commit
mailing list