On Mon, Mar 4, 2013 at 2:22 PM, Marek Olšák <mar...@gmail.com> wrote:
> ---
> src/mesa/main/teximage.c | 22 ++++++++++++----------
> 1 file changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c
> index 0dcf88a..a7b88d1 100644
> --- a/src/mesa/main/teximage.c
> +++ b/src/mesa/main/teximage.c
> @@ -3494,19 +3494,21 @@ copyteximage(struct gl_context *ctx, GLuint dims,
> _mesa_init_teximage_fields(ctx, texImage, width, height, 1,
> border, internalFormat, texFormat);
>
> - /* Allocate texture memory (no pixel data yet) */
> - ctx->Driver.AllocTextureImageBuffer(ctx, texImage);
> + if (width && height) {
> + /* Allocate texture memory (no pixel data yet) */
> + ctx->Driver.AllocTextureImageBuffer(ctx, texImage);
>
> - if (_mesa_clip_copytexsubimage(ctx, &dstX, &dstY, &srcX, &srcY,
> - &width, &height)) {
> - struct gl_renderbuffer *srcRb =
> - get_copy_tex_image_source(ctx, texImage->TexFormat);
> + if (_mesa_clip_copytexsubimage(ctx, &dstX, &dstY, &srcX, &srcY,
> + &width, &height)) {
> + struct gl_renderbuffer *srcRb =
> + get_copy_tex_image_source(ctx, texImage->TexFormat);
>
> - ctx->Driver.CopyTexSubImage(ctx, dims, texImage, dstX, dstY,
> dstZ,
> - srcRb, srcX, srcY, width, height);
> - }
> + ctx->Driver.CopyTexSubImage(ctx, dims, texImage, dstX, dstY,
> dstZ,
> + srcRb, srcX, srcY, width, height);
> + }
>
> - check_gen_mipmap(ctx, target, texObj, level);
> + check_gen_mipmap(ctx, target, texObj, level);
> + }
>
> _mesa_update_fbo_texture(ctx, texObj, face, level);
>
Candidate for stable branches?
Reviewed-by: Brian Paul <bri...@vmware.com>
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev
