From: Anuj Phogat <anuj.phogat@gmail.com>
Date: Wed, 4 Feb 2015 00:56:04 +0000 (-0800)
Subject: meta: Fix buffer object assignment to account for both pack and unpack bo's
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=068ba4ac78a62d2d07300a54e6585e16a2c747d5;p=mesa.git

meta: Fix buffer object assignment to account for both pack and unpack bo's

create_texture_for_pbo() is shared by _mesa_meta_pbo_GetTexSubImage()
and _mesa_meta_pbo_TexSubImage() functions. So, we need to account
for both pack and unpack buffer objects.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Neil Roberts <neil@linux.intel.com>
---

diff --git a/src/mesa/drivers/common/meta_tex_subimage.c b/src/mesa/drivers/common/meta_tex_subimage.c
index ca6fb6a5f21..2aa3a4ce281 100644
--- a/src/mesa/drivers/common/meta_tex_subimage.c
+++ b/src/mesa/drivers/common/meta_tex_subimage.c
@@ -96,7 +96,7 @@ create_texture_for_pbo(struct gl_context *ctx, bool create_pbo,
          _mesa_BufferData(pbo_target, row_stride * height, pixels,
                           GL_STREAM_DRAW);
 
-      buffer_obj = ctx->Unpack.BufferObj;
+      buffer_obj = packing->BufferObj;
       pixels = NULL;
 
       _mesa_BindBuffer(pbo_target, 0);