diff options
| author | Brian Paul <brianp@vmware.com> | 2012-01-19 11:37:00 -0700 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2012-01-19 16:23:12 -0700 |
| commit | 7f2e12812a2208330ef8704e7c4721ececd2aab3 (patch) | |
| tree | 64d7eed2de0abbc448b38c84532f615879bfc99e /src/gallium/drivers/svga/svga_pipe_blit.c | |
| parent | fdae0eaf222f271bfbc7e71d8561eb8b90685ae5 (diff) | |
svga: move svga_texture() casts/calls in svga_surface_copy()
To fix failed assertions when calling glCopyBufferSubData().
svga_texture() asserts that the resource is a texture. Simply move the
calls to svga_texture() after the code that handles non-texture copies
so that we don't call it with non-texture resources.
Fixes glean bufferObject failure.
NOTE: This is a candidate for the 8.0 branch.
Reviewed-by: José Fonseca <jfonseca@vmware.com>
Diffstat (limited to 'src/gallium/drivers/svga/svga_pipe_blit.c')
| -rw-r--r-- | src/gallium/drivers/svga/svga_pipe_blit.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/drivers/svga/svga_pipe_blit.c b/src/gallium/drivers/svga/svga_pipe_blit.c index c4f122f4f78..8e114d3e30e 100644 --- a/src/gallium/drivers/svga/svga_pipe_blit.c +++ b/src/gallium/drivers/svga/svga_pipe_blit.c @@ -44,8 +44,7 @@ static void svga_surface_copy(struct pipe_context *pipe, const struct pipe_box *src_box) { struct svga_context *svga = svga_context(pipe); - struct svga_texture *stex = svga_texture(src_tex); - struct svga_texture *dtex = svga_texture(dst_tex); + struct svga_texture *stex, *dtex; /* struct pipe_screen *screen = pipe->screen; SVGA3dCopyBox *box; enum pipe_error ret; @@ -63,6 +62,9 @@ static void svga_surface_copy(struct pipe_context *pipe, return; } + stex = svga_texture(src_tex); + dtex = svga_texture(dst_tex); + #if 0 srcsurf = screen->get_tex_surface(screen, src_tex, src_level, src_box->z, src_box->z, |