diff options
| author | Jerome Glisse <glisse@freedesktop.org> | 2009-05-10 16:57:22 +0200 |
|---|---|---|
| committer | Jerome Glisse <glisse@freedesktop.org> | 2009-05-10 16:57:22 +0200 |
| commit | 221b30d595ab2f97fd0518c761615dd28f3ef5ca (patch) | |
| tree | 354ff4786ea95579edac01c5715a934783492dbe /src/mesa/shader/prog_instruction.h | |
| parent | 13e0ff0df1bb75993bded7b248dd37f58fbfd22c (diff) | |
| parent | 53c2cc8fefa07723fc456d94eda292e201c41dae (diff) | |
Merge commit 'origin/master' into radeon-rewrite
Conflicts:
src/mesa/drivers/dri/r200/r200_state.c
src/mesa/drivers/dri/r300/r300_context.h
src/mesa/drivers/dri/r300/r300_fragprog.c
src/mesa/drivers/dri/r300/r300_state.c
src/mesa/drivers/dri/r300/r300_texmem.c
src/mesa/drivers/dri/r300/r300_texstate.c
src/mesa/drivers/dri/r300/r500_fragprog.c
src/mesa/drivers/dri/radeon/radeon_screen.c
src/mesa/drivers/dri/radeon/radeon_state.c
Diffstat (limited to 'src/mesa/shader/prog_instruction.h')
| -rw-r--r-- | src/mesa/shader/prog_instruction.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/shader/prog_instruction.h b/src/mesa/shader/prog_instruction.h index 3109f6cbae..40ad998f79 100644 --- a/src/mesa/shader/prog_instruction.h +++ b/src/mesa/shader/prog_instruction.h @@ -428,6 +428,9 @@ _mesa_num_inst_dst_regs(gl_inst_opcode opcode); extern GLboolean _mesa_is_tex_instruction(gl_inst_opcode opcode); +extern GLboolean +_mesa_check_soa_dependencies(const struct prog_instruction *inst); + extern const char * _mesa_opcode_string(gl_inst_opcode opcode); |