From a921475c22fe88fb6921a1f628d3ea05d55ba43b Mon Sep 17 00:00:00 2001 From: Jason Ekstrand Date: Fri, 17 Apr 2015 15:23:18 -0700 Subject: i965: Do better fake context setup in unit tests In future tests, we will start relying on devinfo and not just brw in the compiler. Changing this now keeps these tests from failing in the future. Reviewed-by: Matt Turner --- src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp') diff --git a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp index f9e4ce1..2ef52e9 100644 --- a/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp +++ b/src/mesa/drivers/dri/i965/test_vec4_copy_propagation.cpp @@ -34,6 +34,7 @@ class copy_propagation_test : public ::testing::Test { public: struct brw_context *brw; + struct brw_device_info *devinfo; struct gl_context *ctx; struct gl_shader_program *shader_prog; struct brw_vertex_program *vp; @@ -93,6 +94,9 @@ protected: void copy_propagation_test::SetUp() { brw = (struct brw_context *)calloc(1, sizeof(*brw)); + devinfo = (struct brw_device_info *)calloc(1, sizeof(*brw)); + brw->intelScreen = (struct intel_screen *)calloc(1, sizeof(*brw->intelScreen)); + brw->intelScreen->devinfo = devinfo; ctx = &brw->ctx; vp = ralloc(NULL, struct brw_vertex_program); @@ -103,7 +107,7 @@ void copy_propagation_test::SetUp() _mesa_init_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0); - brw->gen = 4; + brw->gen = devinfo->gen = 4; } static void -- cgit v1.1