From: Anuj Phogat Date: Fri, 15 May 2015 13:01:15 +0000 (-0700) Subject: meta: Abort texture upload if pixels == null and no pixel unpack buffer set X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8e9eec5cbf73bf977bc7e808a4e653737ee94c38;p=mesa.git meta: Abort texture upload if pixels == null and no pixel unpack buffer set in case of glTexImage{1,2,3}D(). Texture has already been allocated at this point and we have no data to upload. With out this patch, with create_pbo = true, we end up creating a temporary pbo and then uploading uninitialzed texture data. Signed-off-by: Anuj Phogat Reviewed-by: Neil Roberts --- diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c index 6bd74e126f2..d2474f52718 100644 --- a/src/mesa/drivers/common/meta_tex_subimage.c +++ b/src/mesa/drivers/common/meta_tex_subimage.c @@ -151,7 +151,8 @@ _mesa_meta_pbo_TexSubImage(struct gl_context *ctx, GLuint dims, bool success = false; int z; - if (!_mesa_is_bufferobj(packing->BufferObj) && !create_pbo) + if (!_mesa_is_bufferobj(packing->BufferObj) && + (!create_pbo || pixels == NULL)) return false; if (format == GL_DEPTH_COMPONENT ||