Mesa (10.2): nvc0: don't make 1d staging textures linear

[Emil Velikov]

Module: Mesa
Branch: 10.2
Commit: 2a967f712897d6dcd33e9d37e6c7a399580a2d8c
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2a967f712897d6dcd33e9d37e6c7a399580a2d8c

Author: Ilia Mirkin <imirkin at alum.mit.edu>
Date:   Mon Sep  1 00:43:06 2014 -0400

nvc0: don't make 1d staging textures linear

Experimentally, the sampler doesn't appear to like these, neither as
buffer nor as rect textures. So remove 1D from the list of texture types
to make linear when used for staging.

This fixes the OSD in mplayer for VDPAU.

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu>
Cc: "10.2 10.3" <mesa-stable at lists.freedesktop.org>
(cherry picked from commit 115d9a5525e74573ced9209063a1d4a551e6eaa4)

---

 src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c |    1 -
 1 file changed, 1 deletion(-)

diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
index 79c9390..d602aed 100644
--- a/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
+++ b/src/gallium/drivers/nouveau/nvc0/nvc0_miptree.c
@@ -261,7 +261,6 @@ nvc0_miptree_create(struct pipe_screen *pscreen,
 
    if (pt->usage == PIPE_USAGE_STAGING) {
       switch (pt->target) {
-      case PIPE_TEXTURE_1D:
       case PIPE_TEXTURE_2D:
       case PIPE_TEXTURE_RECT:
          if (pt->last_level == 0 &&