diff options
| author | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-05-18 17:06:42 -0700 |
|---|---|---|
| committer | Corbin Simpson <MostAwesomeDude@gmail.com> | 2009-07-08 11:39:34 -0700 |
| commit | 746140e215b86ec6eb9f10be45babe700f8e2e62 (patch) | |
| tree | af672f6d24ed5a1c76b7c054fd222777279e00e2 /src/gallium/drivers/r300/r300_surface.c | |
| parent | 1aa38b2c2d80b67fe2eefe468f90aeb44bc20259 (diff) | |
r300-gallium: Unify sampler and texture emit.
They have to cross into each other's registers.
Diffstat (limited to 'src/gallium/drivers/r300/r300_surface.c')
| -rw-r--r-- | src/gallium/drivers/r300/r300_surface.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/src/gallium/drivers/r300/r300_surface.c b/src/gallium/drivers/r300/r300_surface.c index 96b9a83383..fdabe4d9cf 100644 --- a/src/gallium/drivers/r300/r300_surface.c +++ b/src/gallium/drivers/r300/r300_surface.c @@ -268,14 +268,10 @@ validate: r300_surface_setup(r300, desttex, destx, desty, w, h); /* Setup the texture. */ - r300_emit_sampler(r300, &r300_sampler_copy_state, 0); - r300_emit_texture(r300, srctex, 0); + r300_emit_texture(r300, &r300_sampler_copy_state, srctex, 0); /* Flush and enable. */ - BEGIN_CS(4); - OUT_CS_REG(R300_TX_INVALTAGS, 0); - OUT_CS_REG(R300_TX_ENABLE, 0x1); - END_CS; + r300_flush_textures(r300); /* Vertex shader setup */ if (caps->has_tcl) { |