X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_context.h;h=f235c194b7470d464c6bb346d7c7a4d7d9b24358;hb=6f8286163c79a8187c2912a9b673a6f11f4f60c6;hp=df976260f8e257a3bcfece4a4d9fcf88cba415e9;hpb=daf5b0f41baa50951e7c2f9ea5cd90b119085a7f;p=mesa.git

diff --git a/src/mesa/state_tracker/st_context.h b/src/mesa/state_tracker/st_context.h
index df976260f8e..f235c194b74 100644
--- a/src/mesa/state_tracker/st_context.h
+++ b/src/mesa/state_tracker/st_context.h
@@ -28,24 +28,27 @@
 #ifndef ST_CONTEXT_H
 #define ST_CONTEXT_H
 
-#include "mtypes.h"
+#include "main/mtypes.h"
+#include "shader/prog_cache.h"
 #include "pipe/p_state.h"
 
 
 struct st_context;
-struct st_region;
 struct st_texture_object;
-struct st_texture_image;
 struct st_fragment_program;
 struct draw_context;
 struct draw_stage;
 struct cso_cache;
 struct cso_blend;
+struct gen_mipmap_state;
+struct blit_state;
+
 
 #define ST_NEW_MESA                    0x1 /* Mesa state has changed */
 #define ST_NEW_FRAGMENT_PROGRAM        0x2
 #define ST_NEW_VERTEX_PROGRAM          0x4
 
+
 struct st_state_flags {
    GLuint mesa;
    GLuint st;
@@ -59,46 +62,43 @@ struct st_tracked_state {
 
 
 
-
 struct st_context
 {
    GLcontext *ctx;
 
    struct pipe_context *pipe;
 
-   struct draw_context *draw;  /**< For selection/feedback */
-   struct draw_stage *feedback_stage;  /**< For FL_FEEDBACK rendermode */
+   struct draw_context *draw;  /**< For selection/feedback/rastpos only */
+   struct draw_stage *feedback_stage;  /**< For GL_FEEDBACK rendermode */
    struct draw_stage *selection_stage;  /**< For GL_SELECT rendermode */
+   struct draw_stage *rastpos_stage;  /**< For glRasterPos */
 
-   /* Eventually will use a cache to feed the pipe with
-    * create/bind/delete calls to constant state objects.  Not yet
-    * though, we just shove random objects across the interface.  
+   /* Some state is contained in constant objects.
+    * Other state is just parameter values.
     */
    struct {
-      const struct cso_blend *blend;
-      const struct pipe_sampler_state *sampler[PIPE_MAX_SAMPLERS];
-      const struct pipe_depth_stencil_state *depth_stencil;
-      const struct cso_rasterizer  *rasterizer;
-      const struct cso_fragment_shader *fs;
-      const struct cso_vertex_shader   *vs;
-
-      struct pipe_alpha_test_state  alpha_test;
-      struct pipe_blend_color  blend_color;
-      struct pipe_clear_color_state clear_color;
+      struct pipe_blend_state               blend;
+      struct pipe_depth_stencil_alpha_state depth_stencil;
+      struct pipe_rasterizer_state          rasterizer;
+      struct pipe_sampler_state             samplers[PIPE_MAX_SAMPLERS];
+      struct pipe_sampler_state             *sampler_list[PIPE_MAX_SAMPLERS];
       struct pipe_clip_state clip;
       struct pipe_constant_buffer constants[2];
-      struct pipe_feedback_state feedback;
       struct pipe_framebuffer_state framebuffer;
-      struct pipe_mipmap_tree *texture[PIPE_MAX_SAMPLERS];
+      struct pipe_texture *sampler_texture[PIPE_MAX_SAMPLERS];
       struct pipe_poly_stipple poly_stipple;
       struct pipe_scissor_state scissor;
       struct pipe_viewport_state viewport;
+
+      GLuint num_samplers;
+      GLuint num_textures;
    } state;
 
    struct {
       struct st_tracked_state tracked_state[2];
    } constants;
 
+   /* XXX unused: */
    struct {
       struct gl_fragment_program *fragment_program;
    } cb;
@@ -110,6 +110,12 @@ struct st_context
    char vendor[100];
    char renderer[100];
 
+   /** Can we access the front/back color buffers as pipe_surfaces?
+    * We can't with the Xlib driver...
+    * This is a hack that should be fixed someday.
+    */
+   GLboolean haveFramebufferSurfaces;
+
    /* State to be validated:
     */
    struct st_tracked_state **atoms;
@@ -119,12 +125,48 @@ struct st_context
 
    GLfloat polygon_offset_scale; /* ?? */
 
-   struct st_vertex_program *vp;
-   struct st_fragment_program *fp;
+   GLfloat bitmap_texcoord_bias;
 
-   struct pipe_buffer_handle *default_attrib_buffer;
+   /** Mapping from VERT_RESULT_x to post-transformed vertex slot */
+   const GLuint *vertex_result_to_slot;
 
-   struct cso_cache *cache;
+   struct st_vertex_program *vp;    /**< Currently bound vertex program */
+   struct st_fragment_program *fp;  /**< Currently bound fragment program */
+
+   struct {
+      struct gl_program_cache *cache;
+      struct st_fragment_program *program;  /**< cur pixel transfer prog */
+      GLuint xfer_prog_sn;  /**< pixel xfer program serial no. */
+      GLuint user_prog_sn;  /**< user fragment program serial no. */
+      struct st_fragment_program *combined_prog;
+      GLuint combined_prog_sn;
+   } pixel_xfer;
+
+   /** for glBitmap */
+   struct {
+      struct st_fragment_program *program;  /**< bitmap tex/kil program */
+      GLuint user_prog_sn;  /**< user fragment program serial no. */
+      struct st_fragment_program *combined_prog;
+      struct pipe_shader_state vert_shader;
+      void *vs;
+      float vertices[4][3][4];  /**< vertex pos + color + texcoord */
+      struct pipe_buffer *vbuf;
+   } bitmap;
+
+   /** for glClear */
+   struct {
+      struct pipe_shader_state vert_shader;
+      struct pipe_shader_state frag_shader;
+      void *vs;
+      void *fs;
+      float vertices[4][2][4];  /**< vertex pos + color */
+      struct pipe_buffer *vbuf;
+   } clear;
+
+   struct gen_mipmap_state *gen_mipmap;
+   struct blit_state *blit;
+
+   struct cso_context *cso_context;
 };
 
 
@@ -136,8 +178,22 @@ static INLINE struct st_context *st_context(GLcontext *ctx)
 }
 
 
+/**
+ * Wrapper for GLframebuffer.
+ * This is an opaque type to the outside world.
+ */
+struct st_framebuffer
+{
+   GLframebuffer Base;
+   void *Private;
+   GLuint InitWidth, InitHeight;
+};
+
+
 extern void st_init_driver_functions(struct dd_function_table *functions);
 
+void st_invalidate_state(GLcontext * ctx, GLuint new_state);
+
 
 
 #define Y_0_TOP 1