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

[mesa.git] / src / mesa / drivers / dri / i965 / brw_cfg.h

diff --git a/src/mesa/drivers/dri/i965/brw_cfg.h b/src/mesa/drivers/dri/i965/brw_cfg.h
index 0038f929737b5100e61906024dad5d9c8b498b4d..95a18e9e0820b8c61f6e4363e3578ba5d24bb63a 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_cfg.h
+++ b/src/mesa/drivers/dri/i965/brw_cfg.h
@@ -27,17 +27,17 @@
 
 #include "brw_fs.h"
 
-class fs_bblock_link : public exec_node {
+class bblock_link : public exec_node {
 public:
-   fs_bblock_link(fs_bblock *block)
+   bblock_link(bblock_t *block)
       : block(block)
    {
    }
 
-   fs_bblock *block;
+   bblock_t *block;
 };
 
-class fs_bblock {
+class bblock_t {
 public:
    static void* operator new(size_t size, void *ctx)
    {
@@ -49,14 +49,14 @@ public:
       return node;
    }
 
-   fs_bblock_link *make_list(void *mem_ctx);
+   bblock_link *make_list(void *mem_ctx);
 
-   fs_bblock();
+   bblock_t();
 
-   void add_successor(void *mem_ctx, fs_bblock *successor);
+   void add_successor(void *mem_ctx, bblock_t *successor);
 
-   fs_inst *start;
-   fs_inst *end;
+   backend_instruction *start;
+   backend_instruction *end;
 
    int start_ip;
    int end_ip;
@@ -66,7 +66,7 @@ public:
    int block_num;
 };
 
-class fs_cfg {
+class cfg_t {
 public:
    static void* operator new(size_t size, void *ctx)
    {
@@ -78,17 +78,21 @@ public:
       return node;
    }
 
-   fs_cfg(fs_visitor *v);
-   ~fs_cfg();
-   fs_bblock *new_block();
-   void set_next_block(fs_bblock *block);
+   cfg_t(backend_visitor *v);
+   cfg_t(void *mem_ctx, exec_list *instructions);
+   ~cfg_t();
+
+   void create(void *mem_ctx, exec_list *instructions);
+
+   bblock_t *new_block();
+   void set_next_block(bblock_t *block);
    void make_block_array();
 
    /** @{
     *
     * Used while generating the block list.
     */
-   fs_bblock *cur;
+   bblock_t *cur;
    int ip;
    /** @} */
 
@@ -96,6 +100,6 @@ public:
 
    /** Ordered list (by ip) of basic blocks */
    exec_list block_list;
-   fs_bblock **blocks;
+   bblock_t **blocks;
    int num_blocks;
 };