X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fdrivers%2Fdri%2Fradeon%2Fradeon_tex_copy.c;h=a26acbfdd04d56afb599406606f72e2b2ecfea84;hb=c080202db5363a18a759a9a7c82b40ac558c8abe;hp=29fd31ac23f4c4c8a3591cfdf7dac267888cc611;hpb=f0f04cd12db156ec53b7ea46fae27199af121f90;p=mesa.git diff --git a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c index 29fd31ac23f..a26acbfdd04 100644 --- a/src/mesa/drivers/dri/radeon/radeon_tex_copy.c +++ b/src/mesa/drivers/dri/radeon/radeon_tex_copy.c @@ -37,45 +37,40 @@ #include "radeon_mipmap_tree.h" static GLboolean -do_copy_texsubimage(GLcontext *ctx, - GLenum target, GLint level, +do_copy_texsubimage(struct gl_context *ctx, struct radeon_tex_obj *tobj, radeon_texture_image *timg, GLint dstx, GLint dsty, + struct radeon_renderbuffer *rrb, GLint x, GLint y, GLsizei width, GLsizei height) { radeonContextPtr radeon = RADEON_CONTEXT(ctx); - struct radeon_renderbuffer *rrb; + const GLuint face = timg->base.Base.Face; + const GLuint level = timg->base.Base.Level; unsigned src_bpp; unsigned dst_bpp; gl_format src_mesaformat; gl_format dst_mesaformat; - unsigned src_width; - unsigned dst_width; unsigned flip_y; if (!radeon->vtbl.blit) { return GL_FALSE; } - if (_mesa_get_format_bits(timg->base.TexFormat, GL_DEPTH_BITS) > 0) { - if (ctx->ReadBuffer->_DepthBuffer && ctx->ReadBuffer->_DepthBuffer->Wrapped) { - rrb = radeon_renderbuffer(ctx->ReadBuffer->_DepthBuffer->Wrapped); - } else { - rrb = radeon_renderbuffer(ctx->ReadBuffer->_DepthBuffer); - } - flip_y = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Type == GL_NONE; - } else { - rrb = radeon_renderbuffer(ctx->ReadBuffer->_ColorReadBuffer); - flip_y = ctx->ReadBuffer->Attachment[BUFFER_COLOR0].Type == GL_NONE; - } - // This is software renderbuffer, fallback to swrast if (!rrb) { return GL_FALSE; } + if (_mesa_get_format_bits(timg->base.Base.TexFormat, GL_DEPTH_BITS) > 0) { + /* copying depth values */ + flip_y = ctx->ReadBuffer->Attachment[BUFFER_DEPTH].Type == GL_NONE; + } else { + /* copying color */ + flip_y = ctx->ReadBuffer->Attachment[BUFFER_COLOR0].Type == GL_NONE; + } + if (!timg->mt) { radeon_validate_texture_miptree(ctx, &tobj->base); } @@ -83,29 +78,27 @@ do_copy_texsubimage(GLcontext *ctx, assert(rrb->bo); assert(timg->mt); assert(timg->mt->bo); - assert(timg->base.Width >= dstx + width); - assert(timg->base.Height >= dsty + height); + assert(timg->base.Base.Width >= dstx + width); + assert(timg->base.Base.Height >= dsty + height); intptr_t src_offset = rrb->draw_offset; - intptr_t dst_offset = radeon_miptree_image_offset(timg->mt, _mesa_tex_target_to_face(target), level); + intptr_t dst_offset = radeon_miptree_image_offset(timg->mt, face, level); if (0) { fprintf(stderr, "%s: copying to face %d, level %d\n", - __FUNCTION__, _mesa_tex_target_to_face(target), level); + __FUNCTION__, face, level); fprintf(stderr, "to: x %d, y %d, offset %d\n", dstx, dsty, (uint32_t) dst_offset); fprintf(stderr, "from (%dx%d) width %d, height %d, offset %d, pitch %d\n", - x, y, rrb->base.Width, rrb->base.Height, (uint32_t) src_offset, rrb->pitch/rrb->cpp); + x, y, rrb->base.Base.Width, rrb->base.Base.Height, (uint32_t) src_offset, rrb->pitch/rrb->cpp); fprintf(stderr, "src size %d, dst size %d\n", rrb->bo->size, timg->mt->bo->size); } - src_mesaformat = rrb->base.Format; - dst_mesaformat = timg->base.TexFormat; - src_width = rrb->base.Width; - dst_width = timg->base.Width; + src_mesaformat = rrb->base.Base.Format; + dst_mesaformat = timg->base.Base.TexFormat; src_bpp = _mesa_get_format_bytes(src_mesaformat); dst_bpp = _mesa_get_format_bytes(dst_mesaformat); - if (!radeon->vtbl.check_blit(dst_mesaformat)) { + if (!radeon->vtbl.check_blit(dst_mesaformat, rrb->pitch / rrb->cpp)) { /* depth formats tend to be special */ if (_mesa_get_format_bits(dst_mesaformat, GL_DEPTH_BITS) > 0) return GL_FALSE; @@ -133,83 +126,35 @@ do_copy_texsubimage(GLcontext *ctx, /* blit from src buffer to texture */ return radeon->vtbl.blit(ctx, rrb->bo, src_offset, src_mesaformat, rrb->pitch/rrb->cpp, - src_width, rrb->base.Height, x, y, + rrb->base.Base.Width, rrb->base.Base.Height, x, y, timg->mt->bo, dst_offset, dst_mesaformat, timg->mt->levels[level].rowstride / dst_bpp, - dst_width, timg->base.Height, + timg->base.Base.Width, timg->base.Base.Height, dstx, dsty, width, height, flip_y); } void -radeonCopyTexImage2D(GLcontext *ctx, GLenum target, GLint level, - GLenum internalFormat, - GLint x, GLint y, GLsizei width, GLsizei height, - GLint border) -{ - struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx); - struct gl_texture_object *texObj = - _mesa_select_tex_object(ctx, texUnit, target); - struct gl_texture_image *texImage = - _mesa_select_tex_image(ctx, texObj, target, level); - int srcx, srcy, dstx, dsty; - - if (border) - goto fail; - - /* Setup or redefine the texture object, mipmap tree and texture - * image. Don't populate yet. - */ - ctx->Driver.TexImage2D(ctx, target, level, internalFormat, - width, height, border, - GL_RGBA, GL_UNSIGNED_BYTE, NULL, - &ctx->DefaultPacking, texObj, texImage); - - srcx = x; - srcy = y; - dstx = 0; - dsty = 0; - if (!_mesa_clip_copytexsubimage(ctx, - &dstx, &dsty, - &srcx, &srcy, - &width, &height)) { - return; - } - - if (!do_copy_texsubimage(ctx, target, level, - radeon_tex_obj(texObj), (radeon_texture_image *)texImage, - 0, 0, x, y, width, height)) { - goto fail; - } - - return; - -fail: - radeon_print(RADEON_FALLBACKS, RADEON_NORMAL, - "Falling back to sw for glCopyTexImage2D (internalFormat %s, border %d)\n", - _mesa_lookup_enum_by_nr(internalFormat), border); - - _mesa_meta_CopyTexImage2D(ctx, target, level, internalFormat, x, y, - width, height, border); -} - -void -radeonCopyTexSubImage2D(GLcontext *ctx, GLenum target, GLint level, +radeonCopyTexSubImage2D(struct gl_context *ctx, + struct gl_texture_image *texImage, GLint xoffset, GLint yoffset, + struct gl_renderbuffer *rb, GLint x, GLint y, GLsizei width, GLsizei height) { - struct gl_texture_unit *texUnit = _mesa_get_current_tex_unit(ctx); - struct gl_texture_object *texObj = _mesa_select_tex_object(ctx, texUnit, target); - struct gl_texture_image *texImage = _mesa_select_tex_image(ctx, texObj, target, level); + radeonContextPtr radeon = RADEON_CONTEXT(ctx); + radeon_prepare_render(radeon); - if (!do_copy_texsubimage(ctx, target, level, - radeon_tex_obj(texObj), (radeon_texture_image *)texImage, - xoffset, yoffset, x, y, width, height)) { + if (!do_copy_texsubimage(ctx, + radeon_tex_obj(texImage->TexObject), + (radeon_texture_image *)texImage, + xoffset, yoffset, + radeon_renderbuffer(rb), x, y, width, height)) { radeon_print(RADEON_FALLBACKS, RADEON_NORMAL, "Falling back to sw for glCopyTexSubImage2D\n"); - _mesa_meta_CopyTexSubImage2D(ctx, target, level, - xoffset, yoffset, x, y, width, height); + _mesa_meta_CopyTexSubImage2D(ctx, texImage, + xoffset, yoffset, + rb, x, y, width, height); } }