i965/blorp: Use blorp_address in brw_blorp_surface instead of bo+offset

[mesa.git] / src / mesa / drivers / dri / i965 / brw_ff_gs.c

diff --git a/src/mesa/drivers/dri/i965/brw_ff_gs.c b/src/mesa/drivers/dri/i965/brw_ff_gs.c
index a7d061a06710e97f5999a4af7b7a07a3687f597d..9065e08d970c2f53f66c276e7e3277deebdaff14 100644 (file)
--- a/src/mesa/drivers/dri/i965/brw_ff_gs.c
+++ b/src/mesa/drivers/dri/i965/brw_ff_gs.c
@@ -29,7 +29,6 @@
   *   Keith Whitwell <keithw@vmware.com>
   */
 
-#include "main/glheader.h"
 #include "main/macros.h"
 #include "main/enums.h"
 #include "main/transformfeedback.h"
@@ -46,7 +45,7 @@
 #include "util/ralloc.h"
 
 void
-brw_compile_ff_gs_prog(struct brw_context *brw,
+brw_codegen_ff_gs_prog(struct brw_context *brw,
                        struct brw_ff_gs_prog_key *key)
 {
    struct brw_ff_gs_compile c;
@@ -64,7 +63,7 @@ brw_compile_ff_gs_prog(struct brw_context *brw,
 
    /* Begin the compilation:
     */
-   brw_init_compile(brw, &c.func, mem_ctx);
+   brw_init_codegen(brw->intelScreen->devinfo, &c.func, mem_ctx);
 
    c.func.single_program_flow = 1;
 
@@ -150,7 +149,7 @@ brw_compile_ff_gs_prog(struct brw_context *brw,
 }
 
 static bool
-brw_ff_gs_state_dirty(struct brw_context *brw)
+brw_ff_gs_state_dirty(const struct brw_context *brw)
 {
    return brw_state_dirty(brw,
                           _NEW_LIGHT,
@@ -255,7 +254,7 @@ brw_upload_ff_gs_prog(struct brw_context *brw)
       if (!brw_search_cache(&brw->cache, BRW_CACHE_FF_GS_PROG,
                            &key, sizeof(key),
                            &brw->ff_gs.prog_offset, &brw->ff_gs.prog_data)) {
-         brw_compile_ff_gs_prog(brw, &key);
+         brw_codegen_ff_gs_prog(brw, &key);
       }
    }
 }