diff options
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.cpp | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4.h | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/i965/brw_vec4_emit.cpp | 5 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/i965/brw_vec4.cpp b/src/mesa/drivers/dri/i965/brw_vec4.cpp index 535eca48e7d..429e8cc9fd7 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4.cpp @@ -1542,7 +1542,7 @@ brw_vs_emit(struct brw_context *brw, return NULL; } - vec4_generator g(brw, prog, &c->vp->program.Base, mem_ctx, + vec4_generator g(brw, prog, &c->vp->program.Base, &prog_data->base, mem_ctx, INTEL_DEBUG & DEBUG_VS); const unsigned *generated =g.generate_assembly(&v.instructions, final_assembly_size); diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa/drivers/dri/i965/brw_vec4.h index 8986648793a..833bef17d0e 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4.h +++ b/src/mesa/drivers/dri/i965/brw_vec4.h @@ -539,6 +539,7 @@ public: vec4_generator(struct brw_context *brw, struct gl_shader_program *shader_prog, struct gl_program *prog, + struct brw_vec4_prog_data *prog_data, void *mem_ctx, bool debug_flag); ~vec4_generator(); @@ -604,6 +605,8 @@ private: struct gl_shader *shader; const struct gl_program *prog; + struct brw_vec4_prog_data *prog_data; + void *mem_ctx; const bool debug_flag; }; diff --git a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp index 6ebc318a13d..5417c82dbb2 100644 --- a/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp +++ b/src/mesa/drivers/dri/i965/brw_vec4_emit.cpp @@ -135,10 +135,11 @@ vec4_instruction::get_src(int i) vec4_generator::vec4_generator(struct brw_context *brw, struct gl_shader_program *shader_prog, struct gl_program *prog, + struct brw_vec4_prog_data *prog_data, void *mem_ctx, bool debug_flag) - : brw(brw), shader_prog(shader_prog), prog(prog), mem_ctx(mem_ctx), - debug_flag(debug_flag) + : brw(brw), shader_prog(shader_prog), prog(prog), prog_data(prog_data), + mem_ctx(mem_ctx), debug_flag(debug_flag) { shader = shader_prog ? shader_prog->_LinkedShaders[MESA_SHADER_VERTEX] : NULL; |