X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=src%2Fmesa%2Fstate_tracker%2Fst_cb_fbo.h;h=f335c371b0b84cc59d2f2e37db0008fa037ac991;hb=be6227d29dcf443d9b8bae66d3d2f0b946874a83;hp=7a45a608fe120d3d541c6fcbd3fcbbb6f864284c;hpb=e5c7d1e1c8ccb493c63e33d017c28b5cf4a55829;p=mesa.git

diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h
index 7a45a608fe1..f335c371b0b 100644
--- a/src/mesa/state_tracker/st_cb_fbo.h
+++ b/src/mesa/state_tracker/st_cb_fbo.h
@@ -29,6 +29,15 @@
 #ifndef ST_CB_FBO_H
 #define ST_CB_FBO_H
 
+#include "main/compiler.h"
+#include "main/glheader.h"
+#include "main/mtypes.h"
+
+#include "pipe/p_compiler.h"
+#include "pipe/p_format.h"
+
+struct dd_function_table;
+struct pipe_context;
 
 /**
  * Derived renderbuffer class.  Just need to add a pointer to the
@@ -37,26 +46,20 @@
 struct st_renderbuffer
 {
    struct gl_renderbuffer Base;
-   struct pipe_texture *texture;
+   struct pipe_resource *texture;
    struct pipe_surface *surface; /* temporary view into texture */
-   struct pipe_sampler_view *sampler_view;
-   enum pipe_format format;  /** preferred format, or PIPE_FORMAT_NONE */
    GLboolean defined;        /**< defined contents? */
 
+   struct pipe_transfer *transfer; /**< only used when mapping the resource */
+
    /**
     * Used only when hardware accumulation buffers are not supported.
     */
    boolean software;
-   size_t stride;
    void *data;
-   
-   struct st_texture_object *rtt;  /**< GL render to texture's texture */
-   int rtt_level, rtt_face, rtt_slice;
 
-   /** Render to texture state */
-   struct pipe_texture *texture_save;
-   struct pipe_surface *surface_save;
-   struct pipe_sampler_view *sampler_view_save;
+   struct st_texture_object *rtt;  /**< GL render to texture's texture */
+   unsigned rtt_level, rtt_face, rtt_slice;
 };
 
 
@@ -73,9 +76,4 @@ st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw);
 extern void
 st_init_fbo_functions(struct dd_function_table *functions);
 
-extern struct pipe_sampler_view *
-st_renderbuffer_get_sampler_view(struct st_renderbuffer *rb,
-                                 struct pipe_context *pipe);
-
-
 #endif /* ST_CB_FBO_H */