Merge remote branch 'origin/7.8'

[mesa.git] / src / gallium / drivers / nv30 / nv30_miptree.c

diff --git a/src/gallium/drivers/nv30/nv30_miptree.c b/src/gallium/drivers/nv30/nv30_miptree.c
index d8a9d3f093f0d1e3fb63c58cca3f0f3aef77e6cf..bfa27b632f70e24a5f759ddcaff10a2d6a46ecac 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_miptree.c
+++ b/src/gallium/drivers/nv30/nv30_miptree.c
@@ -88,11 +88,11 @@ nv30_miptree_create(struct pipe_screen *pscreen, const struct pipe_texture *pt)
        else {
                switch (pt->format) {
                /* TODO: Figure out which formats can be swizzled */
-               case PIPE_FORMAT_A8R8G8B8_UNORM:
-               case PIPE_FORMAT_X8R8G8B8_UNORM:
+               case PIPE_FORMAT_B8G8R8A8_UNORM:
+               case PIPE_FORMAT_B8G8R8X8_UNORM:
                case PIPE_FORMAT_R16_SNORM:
-               case PIPE_FORMAT_R5G6B5_UNORM:
-               case PIPE_FORMAT_A8L8_UNORM:
+               case PIPE_FORMAT_B5G6R5_UNORM:
+               case PIPE_FORMAT_L8A8_UNORM:
                case PIPE_FORMAT_A8_UNORM:
                case PIPE_FORMAT_L8_UNORM:
                case PIPE_FORMAT_I8_UNORM:
@@ -232,8 +232,9 @@ void
 nv30_screen_init_miptree_functions(struct pipe_screen *pscreen)
 {
        pscreen->texture_create = nv30_miptree_create;
-       pscreen->texture_blanket = nv30_miptree_blanket;
        pscreen->texture_destroy = nv30_miptree_destroy;
        pscreen->get_tex_surface = nv30_miptree_surface_new;
        pscreen->tex_surface_destroy = nv30_miptree_surface_del;
+
+       nouveau_screen(pscreen)->texture_blanket = nv30_miptree_blanket;
 }