diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-11-21 01:52:22 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-11-21 01:52:22 +0000 |
| commit | 8bf75f28de161173d1cdaad8c74bcac074e1211e (patch) | |
| tree | 5a9b3887c2d75612f07b43faa3cd6ed1fd0a273d /src/gallium/drivers/i965/brw_pipe_sampler.c | |
| parent | 95d7aca4b9963820e7ead81830340dbeb563897b (diff) | |
i965g: get basic texturing working again
Revert to fixed-layout surface binding table -- it's probably the best
way to do this. Pass sampler and texture numbers separately even
though we're always keeping them the same at present.
Diffstat (limited to 'src/gallium/drivers/i965/brw_pipe_sampler.c')
| -rw-r--r-- | src/gallium/drivers/i965/brw_pipe_sampler.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/gallium/drivers/i965/brw_pipe_sampler.c b/src/gallium/drivers/i965/brw_pipe_sampler.c index f0a765ecf5..5cd38a43a6 100644 --- a/src/gallium/drivers/i965/brw_pipe_sampler.c +++ b/src/gallium/drivers/i965/brw_pipe_sampler.c @@ -107,7 +107,7 @@ static void * brw_create_sampler_state( struct pipe_context *pipe, const struct pipe_sampler_state *template ) { - struct brw_sampler_state *sampler = CALLOC_STRUCT(brw_sampler_state); + struct brw_sampler *sampler = CALLOC_STRUCT(brw_sampler); sampler->ss0.min_filter = translate_img_filter( template->min_img_filter ); sampler->ss0.mag_filter = translate_img_filter( template->mag_img_filter ); @@ -214,7 +214,6 @@ void brw_pipe_sampler_init( struct brw_context *brw ) brw->base.set_sampler_textures = brw_set_sampler_textures; } - void brw_pipe_sampler_cleanup( struct brw_context *brw ) { } |