st/mesa: Combine the DrawPixels and Bitmap passthrough VS programs.

[mesa.git] / src / mesa / state_tracker / st_context.h

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index 622b7a40dc4946b6fa8be8d0ccb40bf2101a2e40..b31e719708e369e6e97c3a5e139dac2d1a963242 100644 (file)
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -224,14 +224,12 @@ struct st_context
       struct pipe_sampler_state sampler;
       struct pipe_sampler_state atlas_sampler;
       enum pipe_format tex_format;
-      void *vs;
       struct st_bitmap_cache cache;
    } bitmap;
 
    /** for glDraw/CopyPixels */
    struct {
       void *zs_shaders[4];
-      void *vert_shader;   /**< ureg shader */
    } drawpix;
 
    /** Cache of glDrawPixels images */
@@ -278,6 +276,9 @@ struct st_context
    /** for drawing with st_util_vertex */
    struct pipe_vertex_element util_velems[3];
 
+   /** passthrough vertex shader matching the util_velem attributes */
+   void *passthrough_vs;
+
    enum pipe_texture_target internal_target;
 
    struct cso_context *cso_context;