diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-03-15 10:24:55 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-03-15 10:24:55 +0000 |
| commit | 506130fff5685742d280bde8800be036c8e8ebfa (patch) | |
| tree | fbfa5afedf1a6d3b18051f5c278dcecc2baa07db /src/gallium/drivers/r300/r300_context.h | |
| parent | 42910ebe7b9748c0ecb6a597bae3e7d43c7e170f (diff) | |
r300g: fix up after merge
Diffstat (limited to 'src/gallium/drivers/r300/r300_context.h')
| -rw-r--r-- | src/gallium/drivers/r300/r300_context.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/gallium/drivers/r300/r300_context.h b/src/gallium/drivers/r300/r300_context.h index 2763103fda..0c8fb6860e 100644 --- a/src/gallium/drivers/r300/r300_context.h +++ b/src/gallium/drivers/r300/r300_context.h @@ -139,7 +139,7 @@ struct r300_texture_fb_state { struct r300_textures_state { /* Textures. */ - struct r300_texture *textures[8]; + struct pipe_sampler_view *fragment_sampler_views[8]; int texture_count; /* Sampler states. */ struct r300_sampler_state *sampler_states[8]; @@ -343,9 +343,8 @@ struct r300_context { struct r300_atom rs_block_state; /* Scissor state. */ struct r300_atom scissor_state; - /* Sampler view states. */ - struct pipe_sampler_view* fragment_sampler_views[8]; - int fragment_sampler_view_count; + /* Textures state. */ + struct r300_atom textures_state; /* Vertex stream formatting state. */ struct r300_atom vertex_stream_state; /* VAP (vertex shader) output mapping state. */ |