diff options
| author | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
|---|---|---|
| committer | Maciej Cencora <m.cencora@gmail.com> | 2009-11-18 22:09:33 +0100 |
| commit | cefee4e327c92daa2f01b6de650a43eddd348063 (patch) | |
| tree | d1d25c4883357b12fd0c1deecc49cddc7e46976d /src/mesa/drivers/dri/r300/r300_cmdbuf.c | |
| parent | d4dc2e30dada1be425e95ba270920db6eb210982 (diff) | |
| parent | 7118db870091d4c9c2465e79f361ff0ed36d1f90 (diff) | |
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
Diffstat (limited to 'src/mesa/drivers/dri/r300/r300_cmdbuf.c')
| -rw-r--r-- | src/mesa/drivers/dri/r300/r300_cmdbuf.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/r300/r300_cmdbuf.c b/src/mesa/drivers/dri/r300/r300_cmdbuf.c index c7996eb76a..ad8db6e68e 100644 --- a/src/mesa/drivers/dri/r300/r300_cmdbuf.c +++ b/src/mesa/drivers/dri/r300/r300_cmdbuf.c @@ -46,14 +46,12 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. #include "r300_context.h" #include "r300_ioctl.h" -#include "radeon_reg.h" #include "r300_reg.h" #include "r300_cmdbuf.h" #include "r300_emit.h" #include "radeon_bocs_wrapper.h" #include "radeon_mipmap_tree.h" #include "r300_state.h" -#include "radeon_reg.h" #include "radeon_queryobj.h" /** # of dwords reserved for additional instructions that may need to be written @@ -171,7 +169,7 @@ static void emit_tex_offsets(GLcontext *ctx, struct radeon_state_atom * atom) if (t && !t->image_override) { BEGIN_BATCH_NO_AUTOSTATE(4); OUT_BATCH_REGSEQ(R300_TX_OFFSET_0 + (i * 4), 1); - OUT_BATCH_RELOC(t->tile_bits, t->mt->bo, 0, + OUT_BATCH_RELOC(t->tile_bits, t->mt->bo, get_base_teximage_offset(t), RADEON_GEM_DOMAIN_GTT|RADEON_GEM_DOMAIN_VRAM, 0, 0); END_BATCH(); } else if (!t) { |