fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 12:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

gallium: move setup of dest_surface in do_copy_texsubimage()

Browse source
This commit is contained in:
Michal Danzer 2008-05-06 12:34:34 -06:00 • committed by Brian Paul
parent a6ad492774
commit f7dbd18371
1 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
src/mesa/state_tracker/st_cb_texture.c
View file

@ -1129,6 +1129,7 @@ do_copy_texsubimage(GLcontext *ctx,
struct st_renderbuffer *strb;
struct pipe_context *pipe = ctx->st->pipe;
struct pipe_screen *screen = pipe->screen;
struct pipe_surface *dest_surface;
uint dest_format, src_format;
uint do_flip = FALSE;
GLboolean use_fallback = GL_TRUE;
@ -1159,7 +1160,13 @@ do_copy_texsubimage(GLcontext *ctx,
src_format = strb->surface->format;
dest_format = stImage->pt->format;
if (ctx->_ImageTransferState == 0x0) {
dest_surface = screen->get_tex_surface(screen, stImage->pt, stImage->face,
stImage->level, destZ,
PIPE_BUFFER_USAGE_CPU_WRITE);
if (ctx->_ImageTransferState == 0x0 &&
strb->surface->buffer &&
dest_surface->buffer) {
/* do blit-style copy */
/* XXX may need to invert image depending on window
@ -1182,14 +1189,6 @@ do_copy_texsubimage(GLcontext *ctx,
x, y + height, dstx, dsty, width, height,
GL_COPY); /* ? */
#else
struct pipe_surface *dest_surface;
dest_surface = screen->get_tex_surface(screen, stImage->pt, stImage->face,
stImage->level, destZ,
PIPE_BUFFER_USAGE_GPU_WRITE);
assert(strb->surface->buffer);
assert(dest_surface->buffer);
if (src_format == dest_format) {
pipe->surface_copy(pipe,
@ -1217,8 +1216,6 @@ do_copy_texsubimage(GLcontext *ctx,
0.0, PIPE_TEX_MIPFILTER_NEAREST);
use_fallback = GL_FALSE;
}
pipe_surface_reference(&dest_surface, NULL);
#endif
}
@ -1229,6 +1226,8 @@ do_copy_texsubimage(GLcontext *ctx,
srcX, srcY, width, height);
}
pipe_surface_reference(&dest_surface, NULL);
if (level == texObj->BaseLevel && texObj->GenerateMipmap) {
ctx->Driver.GenerateMipmap(ctx, target, texObj);
}