i965/vec4: Make with_writemask() non-static.

[mesa.git] / src / mesa / drivers / dri / i965 / test_vec4_register_coalesce.cpp

diff --git a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
index 71f6b1aaa86c2117174f962bae448ca26c04b637..ab4498b4eed381bf15c9b11f134237d9be1d81ba 100644 (file)
--- a/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
+++ b/src/mesa/drivers/dri/i965/test_vec4_register_coalesce.cpp
@@ -23,6 +23,7 @@
 
 #include <gtest/gtest.h>
 #include "brw_vec4.h"
+#include "brw_vs.h"
 
 using namespace brw;
 
@@ -35,7 +36,6 @@ class register_coalesce_test : public ::testing::Test {
 
 public:
    struct brw_context *brw;
-   struct intel_context *intel;
    struct gl_context *ctx;
    struct gl_shader_program *shader_prog;
    struct brw_vertex_program *vp;
@@ -60,10 +60,9 @@ protected:
       return NULL;
    }
 
-   virtual int setup_attributes(int payload_reg)
+   virtual void setup_payload()
    {
       assert(!"Not reached");
-      return 0;
    }
 
    virtual void emit_prolog()
@@ -96,8 +95,7 @@ protected:
 void register_coalesce_test::SetUp()
 {
    brw = (struct brw_context *)calloc(1, sizeof(*brw));
-   intel = &brw->intel;
-   ctx = &intel->ctx;
+   ctx = &brw->ctx;
 
    vp = ralloc(NULL, struct brw_vertex_program);
 
@@ -107,7 +105,7 @@ void register_coalesce_test::SetUp()
 
    _mesa_init_vertex_program(ctx, &vp->program, GL_VERTEX_SHADER, 0);
 
-   intel->gen = 4;
+   brw->gen = 4;
 }
 
 static void