diff options
| author | Roland Scheidegger <sroland@vmware.com> | 2010-05-21 20:02:22 +0200 |
|---|---|---|
| committer | Roland Scheidegger <sroland@vmware.com> | 2010-05-21 20:02:22 +0200 |
| commit | 3293bcdc80cdfa20a2381aae2b94505bdf95d857 (patch) | |
| tree | 16ab1ae66010f6d8b1325dbfa9006126a8e95771 /src/gallium/drivers/nvfx/nv04_surface_2d.c | |
| parent | 8504c5d931e47765a15fdaec2df2cb6502a1bd5c (diff) | |
| parent | ce65caba846b03b5ef4144e311b85cfd48ab9bbb (diff) | |
Merge branch 'gallium-msaa'
Conflicts:
src/mesa/state_tracker/st_gen_mipmap.c
src/mesa/state_tracker/st_texture.c
Diffstat (limited to 'src/gallium/drivers/nvfx/nv04_surface_2d.c')
| -rw-r--r-- | src/gallium/drivers/nvfx/nv04_surface_2d.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/gallium/drivers/nvfx/nv04_surface_2d.c b/src/gallium/drivers/nvfx/nv04_surface_2d.c index 4ed574227d..7acbb505df 100644 --- a/src/gallium/drivers/nvfx/nv04_surface_2d.c +++ b/src/gallium/drivers/nvfx/nv04_surface_2d.c @@ -502,12 +502,9 @@ nv04_surface_wrap_for_render(struct pipe_screen *pscreen, struct nv04_surface* temp_ns; int temp_flags; - temp_flags = (ns->base.usage | - PIPE_BIND_BLIT_SOURCE | - PIPE_BIND_BLIT_DESTINATION); + temp_flags = ns->base.usage; - ns->base.usage = (PIPE_BIND_BLIT_SOURCE | - PIPE_BIND_BLIT_DESTINATION); + ns->base.usage = 0; memset(&templ, 0, sizeof(templ)); templ.format = ns->base.texture->format; @@ -526,7 +523,7 @@ nv04_surface_wrap_for_render(struct pipe_screen *pscreen, temp_ns = (struct nv04_surface*)pscreen->get_tex_surface(pscreen, temp_tex, 0, 0, 0, temp_flags); temp_ns->backing = ns; - if(ns->base.usage & PIPE_BIND_BLIT_SOURCE) + if(1) /* hmm */ eng2d->copy(eng2d, &temp_ns->backing->base, 0, 0, &ns->base, 0, 0, ns->base.width, ns->base.height); |