From: Eric Anholt <eric@anholt.net>
Date: Mon, 4 Nov 2013 23:49:52 +0000 (-0800)
Subject: i965: Fix context initialization after 2f896627175384fd5
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=3f319eef76a31776085accb38c06851bc04f64b8;p=mesa.git

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@linux.intel.com
Reviewed-by: Matt Turner <mattst88@gmail.com>
---

diff --git a/src/mesa/drivers/dri/i965/brw_context.c b/src/mesa/drivers/dri/i965/brw_context.c
index 1f4fbbfb653..ab420fbfe20 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;
    }
 }