From: Christoph Bumiller <e0425955@student.tuwien.ac.at>
Date: Thu, 11 Mar 2010 16:14:14 +0000 (+0100)
Subject: nv50: take format from sampler view, not the referenced texture
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a671a9eed08e63e97ec4257adea2c09dd7d2b4e2;p=mesa.git

nv50: take format from sampler view, not the referenced texture
---

diff --git a/src/gallium/drivers/nv50/nv50_tex.c b/src/gallium/drivers/nv50/nv50_tex.c
index 79639e81eb3..85ab947c006 100644
--- a/src/gallium/drivers/nv50/nv50_tex.c
+++ b/src/gallium/drivers/nv50/nv50_tex.c
@@ -105,7 +105,7 @@ nv50_tex_construct(struct nv50_sampler_view *view)
 	struct nv50_miptree *mt = nv50_miptree(view->pipe.texture);
 	uint32_t swz[4], *tic = view->tic;
 
-	tic[0] = nv50_texture_formats[mt->base.base.format];
+	tic[0] = nv50_texture_formats[view->pipe.format];
 
 	swz[0] = nv50_tic_swizzle(tic[0], view->pipe.swizzle_r);
 	swz[1] = nv50_tic_swizzle(tic[0], view->pipe.swizzle_g);