Merge branch 'master' into gallium-sampler-view

[mesa.git] / src / gallium / drivers / nv40 / nv40_context.h

diff --git a/src/gallium/drivers/nv40/nv40_context.h b/src/gallium/drivers/nv40/nv40_context.h
index 2550ec654b31d4aec4b91a6b3901afa8d7c1ef9e..4d2ffd9772d467af321890f10b815c6c849a0029 100644 (file)
--- a/src/gallium/drivers/nv40/nv40_context.h
+++ b/src/gallium/drivers/nv40/nv40_context.h
@@ -158,6 +158,7 @@ struct nv40_context {
        unsigned idxbuf_format;
        struct nv40_sampler_state *tex_sampler[PIPE_MAX_SAMPLERS];
        struct nv40_miptree *tex_miptree[PIPE_MAX_SAMPLERS];
+       struct pipe_sampler_view *fragment_sampler_views[PIPE_MAX_SAMPLERS];
        unsigned nr_samplers;
        unsigned nr_textures;
        unsigned dirty_samplers;