Merge remote branch 'origin/7.8'

[mesa.git] / src / gallium / drivers / nv30 / nv30_state.h

diff --git a/src/gallium/drivers/nv30/nv30_state.h b/src/gallium/drivers/nv30/nv30_state.h
index 2023278e377e00aabcfaea6ae02e6671232f1a21..66c26360cb2e582561615ea2206bba822430a2ab 100644 (file)
--- a/src/gallium/drivers/nv30/nv30_state.h
+++ b/src/gallium/drivers/nv30/nv30_state.h
@@ -70,19 +70,19 @@ struct nv30_fragment_program {
        struct nouveau_stateobj *so;
 };
 
+#define NV30_MAX_TEXTURE_LEVELS  16
+
 struct nv30_miptree {
        struct pipe_texture base;
+       struct nouveau_bo *bo;
 
        struct pipe_buffer *buffer;
        uint total_size;
 
-       struct pipe_texture *shadow_tex;
-       struct pipe_surface *shadow_surface;
-
        struct {
                uint pitch;
                uint *image_offset;
-       } level[PIPE_MAX_TEXTURE_LEVELS];
+       } level[NV30_MAX_TEXTURE_LEVELS];
 };
 
 #endif