From cab2fed135bc1edf7b65ddca3236020638427061 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Thu, 9 Aug 2012 20:59:44 -0600 Subject: gallium: remove PIPE_MAX_VERTEX/GEOMETRY_SAMPLERS #define PIPE_MAX_SAMPLERS, PIPE_MAX_VERTEX_SAMPLERS and PIPE_MAX_GEOMETRY_SAMPLERS were all defined to the same value (16). In various places we're creating arrays such as sampler_views[PIPE_SHADER_TYPES][PIPE_MAX_SAMPLERS] so we were assuming the same number of max samplers for all shader stages anyway. Of course, drivers are still free to advertise different numbers of max samplers for different shaders. --- src/gallium/drivers/rbug/rbug_context.c | 2 +- src/gallium/drivers/rbug/rbug_context.h | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'src/gallium/drivers/rbug') diff --git a/src/gallium/drivers/rbug/rbug_context.c b/src/gallium/drivers/rbug/rbug_context.c index 65f0d71031b..eb6230ed000 100644 --- a/src/gallium/drivers/rbug/rbug_context.c +++ b/src/gallium/drivers/rbug/rbug_context.c @@ -753,7 +753,7 @@ rbug_set_vertex_sampler_views(struct pipe_context *_pipe, { struct rbug_context *rb_pipe = rbug_context(_pipe); struct pipe_context *pipe = rb_pipe->pipe; - struct pipe_sampler_view *unwrapped_views[PIPE_MAX_VERTEX_SAMPLERS]; + struct pipe_sampler_view *unwrapped_views[PIPE_MAX_SAMPLERS]; struct pipe_sampler_view **views = NULL; unsigned i; diff --git a/src/gallium/drivers/rbug/rbug_context.h b/src/gallium/drivers/rbug/rbug_context.h index 80c803da83f..0a41bbd1047 100644 --- a/src/gallium/drivers/rbug/rbug_context.h +++ b/src/gallium/drivers/rbug/rbug_context.h @@ -54,8 +54,8 @@ struct rbug_context { struct rbug_resource *fs_texs[PIPE_MAX_SAMPLERS]; unsigned num_fs_views; - struct rbug_sampler_view *vs_views[PIPE_MAX_VERTEX_SAMPLERS]; - struct rbug_resource *vs_texs[PIPE_MAX_VERTEX_SAMPLERS]; + struct rbug_sampler_view *vs_views[PIPE_MAX_SAMPLERS]; + struct rbug_resource *vs_texs[PIPE_MAX_SAMPLERS]; unsigned num_vs_views; unsigned nr_cbufs; -- cgit v1.2.3