r300g: only check for an empty shader if there are no compile errors

[mesa.git] / src / gallium / drivers / r600 / r600_context.h

diff --git a/src/gallium/drivers/r600/r600_context.h b/src/gallium/drivers/r600/r600_context.h
index 1c32ced7dc3c4a279c3b33c7a9b73700a5bccac1..dc4e948e8daee8bb10076bb50e8b7d70613e1bb1 100644 (file)
--- a/src/gallium/drivers/r600/r600_context.h
+++ b/src/gallium/drivers/r600/r600_context.h
@@ -124,6 +124,15 @@ struct r600_context_hw_states {
 #define R600_MAX_CONSTANT 256 /* magic */
 #define R600_MAX_RESOURCE 160 /* magic */
 
+struct r600_shader_sampler_states {
+       unsigned                        nsampler;
+       unsigned                        nview;
+       unsigned                        nborder;
+       struct radeon_state             *sampler[PIPE_MAX_ATTRIBS];
+       struct radeon_state             *view[PIPE_MAX_ATTRIBS];
+       struct radeon_state             *border[PIPE_MAX_ATTRIBS];
+};
+
 struct r600_context {
        struct pipe_context             context;
        struct r600_screen              *screen;
@@ -141,11 +150,7 @@ struct r600_context {
        struct r600_context_hw_states   hw_states;
        /* pipe states */
        unsigned                        flat_shade;
-       unsigned                        ps_nsampler;
-       unsigned                        vs_nsampler;
-       unsigned                        ps_nsampler_view;
-       unsigned                        vs_nsampler_view;
-       unsigned                        ps_nsampler_border;
+
        unsigned                        nvertex_buffer;
        struct r600_context_state       *rasterizer;
        struct r600_context_state       *poly_stipple;
@@ -161,11 +166,9 @@ struct r600_context {
        struct r600_context_state       *stencil_ref;
        struct r600_context_state       *viewport;
        struct r600_context_state       *framebuffer;
-       struct radeon_state             *ps_sampler[PIPE_MAX_ATTRIBS];
-       struct radeon_state             *vs_sampler[PIPE_MAX_ATTRIBS];
-       struct radeon_state             *ps_sampler_view[PIPE_MAX_ATTRIBS];
-       struct radeon_state             *vs_sampler_view[PIPE_MAX_ATTRIBS];
-       struct radeon_state             *ps_sampler_border[PIPE_MAX_ATTRIBS];
+       struct r600_shader_sampler_states vs_sampler;
+       struct r600_shader_sampler_states ps_sampler;
+       /* can add gs later */
        struct r600_vertex_element      *vertex_elements;
        struct pipe_vertex_buffer       vertex_buffer[PIPE_MAX_ATTRIBS];
        struct pipe_index_buffer        index_buffer;