From e93243cb80ee3ae834a50efe7bacd232d8846305 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 8 May 2008 16:02:19 -0600 Subject: [PATCH] gallium: clean-up, minor fix --- src/mesa/state_tracker/st_cb_drawpixels.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index c967c989de5..61cbd9e587e 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -986,12 +986,7 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy, stvp = st_make_passthrough_vertex_shader(ctx->st, GL_TRUE); } -#if 0 - psRead = rbRead->surface; - srcFormat = psRead->format; -#else srcFormat = rbRead->texture->format; -#endif if (screen->is_format_supported(screen, srcFormat, PIPE_TEXTURE)) { texFormat = srcFormat; @@ -1003,8 +998,9 @@ st_CopyPixels(GLcontext *ctx, GLint srcx, GLint srcy, assert(texFormat != PIPE_FORMAT_NONE); /* XXX no depth texture formats??? */ } else { - /* todo */ - assert(0); + /* default color format */ + texFormat = st_choose_format(pipe, GL_RGBA, PIPE_TEXTURE); + assert(texFormat != PIPE_FORMAT_NONE); } } -- 2.30.2