From 7f2e12812a2208330ef8704e7c4721ececd2aab3 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 19 Jan 2012 11:37:00 -0700 Subject: svga: move svga_texture() casts/calls in svga_surface_copy() MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 --- src/gallium/drivers/svga/svga_pipe_blit.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/gallium/drivers/svga') 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, -- cgit v1.2.3