diff options
| author | Marek Olšák <[email protected]> | 2012-01-29 23:25:42 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-31 23:12:30 +0100 |
| commit | e4340c1908a6a3b09e1a15d5195f6da7d00494d0 (patch) | |
| tree | 593986b14150b70682913d4c37e4e97ad3f19492 /src/gallium/drivers/r600/r600_asm.h | |
| parent | 78293b99b23268e6698f1267aaf40647c17d95a5 (diff) | |
r600g: merge r600_context with r600_pipe_context
The split made no sense.
Diffstat (limited to 'src/gallium/drivers/r600/r600_asm.h')
| -rw-r--r-- | src/gallium/drivers/r600/r600_asm.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_asm.h b/src/gallium/drivers/r600/r600_asm.h index 3d6544b2e39..f4308523491 100644 --- a/src/gallium/drivers/r600/r600_asm.h +++ b/src/gallium/drivers/r600/r600_asm.h @@ -24,7 +24,7 @@ #define R600_ASM_H struct r600_vertex_element; -struct r600_pipe_context; +struct r600_context; struct r600_bytecode_alu_src { unsigned sel; @@ -223,7 +223,7 @@ void r600_bytecode_dump(struct r600_bytecode *bc); int cm_bytecode_add_cf_end(struct r600_bytecode *bc); -int r600_vertex_elements_build_fetch_shader(struct r600_pipe_context *rctx, struct r600_vertex_element *ve); +int r600_vertex_elements_build_fetch_shader(struct r600_context *rctx, struct r600_vertex_element *ve); /* r700_asm.c */ void r700_bytecode_cf_vtx_build(uint32_t *bytecode, const struct r600_bytecode_cf *cf); |