nouveau: s/TEXTURE_USAGE_PRIMARY/TEXTURE_USAGE_SCANOUT

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index c29c36e20aabc8093c50578313abab1f7305152d..d8a9d3f093f0d1e3fb63c58cca3f0f3aef77e6cf 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -18,7 +18,7 @@ nv30_miptree_layout(struct nv30_miptree *nv30mt)
                                           PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
                                           PIPE_TEXTURE_USAGE_RENDER_TARGET |
                                           PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
-                                          PIPE_TEXTURE_USAGE_PRIMARY);
+                                          PIPE_TEXTURE_USAGE_SCANOUT);
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                nr_faces = 6;
@@ -78,7 +78,7 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
            pt->height0 & (pt->height0 - 1))
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
        else
-       if (pt->tex_usage & (PIPE_TEXTURE_USAGE_PRIMARY |
+       if (pt->tex_usage & (PIPE_TEXTURE_USAGE_SCANOUT |
                             PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
                             PIPE_TEXTURE_USAGE_DEPTH_STENCIL))
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;

diff --git a/src/gallium/drivers/nv40/nv40_miptree.c b/src/gallium/drivers/nv40/nv40_miptree.c
index ad1a9a519528e328a5dc120a14724b95b17d20e3..9acbef4d7d0f6bfc496ddaa72c4f62655db381fb 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_miptree.c
+++ b/src/gallium/drivers/nv40/nv40_miptree.c
@@ -20,7 +20,7 @@ nv40_miptree_layout(struct nv40_miptree *mt)
                                           PIPE_TEXTURE_USAGE_DEPTH_STENCIL |
                                           PIPE_TEXTURE_USAGE_RENDER_TARGET |
                                           PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
-                                          PIPE_TEXTURE_USAGE_PRIMARY);
+                                          PIPE_TEXTURE_USAGE_SCANOUT);
 
        if (pt->target == PIPE_TEXTURE_CUBE) {
                nr_faces = 6;
@@ -80,7 +80,7 @@ nv40_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
            pt->height0 & (pt->height0 - 1))
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;
        else
-       if (pt->tex_usage & (PIPE_TEXTURE_USAGE_PRIMARY |
+       if (pt->tex_usage & (PIPE_TEXTURE_USAGE_SCANOUT |
                             PIPE_TEXTURE_USAGE_DISPLAY_TARGET |
                             PIPE_TEXTURE_USAGE_DEPTH_STENCIL))
                mt->base.tex_usage |= NOUVEAU_TEXTURE_USAGE_LINEAR;

diff --git a/src/gallium/drivers/nv50/nv50_miptree.c b/src/gallium/drivers/nv50/nv50_miptree.c
index 7297c74a83c6ad9a16dc4bd0a99dc65fa23e49d4..133f2204e0d0cb2d9d0796cd6e025b7e5b772e02 100644 (file)
--- a/src/gallium/drivers/nv50/nv50_miptree.c
+++ b/src/gallium/drivers/nv50/nv50_miptree.c
@@ -104,7 +104,7 @@ nv50_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *tmp)
                tile_flags = 0x7400;
                break;
        default:
-               if ((pt->tex_usage & PIPE_TEXTURE_USAGE_PRIMARY) &&
+               if ((pt->tex_usage & PIPE_TEXTURE_USAGE_SCANOUT) &&
                    util_format_get_blocksizebits(pt->format) == 32)
                        tile_flags = 0x7a00;
                else