Module: Mesa
Branch: 9.2
Commit: 961e2c8ada6659373c979d1b3f35abd07b9b52e7
URL:    
http://cgit.freedesktop.org/mesa/mesa/commit/?id=961e2c8ada6659373c979d1b3f35abd07b9b52e7

Author: Tom Stellard <[email protected]>
Date:   Mon Dec  2 21:04:42 2013 -0500

r300/compiler/tests: Fix segfault

Reviewed-by: Alex Deucher <[email protected]>

CC: "9.2" "10.0" <[email protected]>
(cherry picked from commit 1896431f7933e727a0f75c0e0a2da4c580a04a72)

---

 .../tests/radeon_compiler_regalloc_tests.c         |   11 +++++------
 1 files changed, 5 insertions(+), 6 deletions(-)

diff --git 
a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c 
b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
index 511596c..5306b08 100644
--- a/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
+++ b/src/gallium/drivers/r300/compiler/tests/radeon_compiler_regalloc_tests.c
@@ -79,14 +79,13 @@ static void test_runner_rc_regalloc(
 
 static void tex_1d_swizzle(struct test_result *result)
 {
-       struct radeon_compiler c;
+       struct r300_fragment_program_compiler c;
 
-       init_compiler(&c, RC_FRAGMENT_PROGRAM, 0, 0);
-       struct r300_fragment_program_compiler *cc =
-               (struct r300_fragment_program_compiler*)&c;
-       cc->AllocateHwInputs = dummy_allocate_hw_inputs;
+       memset(&c, 0, sizeof(c));
+       init_compiler(&c.Base, RC_FRAGMENT_PROGRAM, 0, 0);
+       c.AllocateHwInputs = dummy_allocate_hw_inputs;
 
-       test_runner_rc_regalloc(result, &c, "regalloc_tex_1d_swizzle.test");
+       test_runner_rc_regalloc(result, &c.Base, 
"regalloc_tex_1d_swizzle.test");
 }
 
 unsigned radeon_compiler_regalloc_run_tests()

_______________________________________________
mesa-commit mailing list
[email protected]
http://lists.freedesktop.org/mailman/listinfo/mesa-commit

Reply via email to