diff options
author | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
---|---|---|
committer | José Fonseca <jfonseca@vmware.com> | 2009-06-11 16:34:56 +0100 |
commit | bf89ecb6c92aaaeccd7b6f093cb8bae9fd56aaf6 (patch) | |
tree | b7b38a1e1bd5e975f77ec23ea872a97dc6963b64 /src/mesa/state_tracker/st_cb_fbo.h | |
parent | 0d2ac7a10b2904eda70794534a9a73b3f4b654cf (diff) | |
parent | cc09724a50a4cabb68b7c5f5b8d3812d38f65391 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/state_tracker/st_cb_fbo.c
src/mesa/state_tracker/st_framebuffer.c
Diffstat (limited to 'src/mesa/state_tracker/st_cb_fbo.h')
-rw-r--r-- | src/mesa/state_tracker/st_cb_fbo.h | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/mesa/state_tracker/st_cb_fbo.h b/src/mesa/state_tracker/st_cb_fbo.h index fd77d0a95b..bea6eb89c3 100644 --- a/src/mesa/state_tracker/st_cb_fbo.h +++ b/src/mesa/state_tracker/st_cb_fbo.h @@ -30,10 +30,6 @@ #define ST_CB_FBO_H -#define DEFAULT_ACCUM_PIPE_FORMAT PIPE_FORMAT_R16G16B16A16_SNORM - - - /** * Derived renderbuffer class. Just need to add a pointer to the * pipe surface. @@ -46,6 +42,13 @@ struct st_renderbuffer enum pipe_format format; /** preferred format, or PIPE_FORMAT_NONE */ GLboolean defined; /**< defined contents? */ + /** + * 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; @@ -63,7 +66,7 @@ st_renderbuffer(struct gl_renderbuffer *rb) extern struct gl_renderbuffer * -st_new_renderbuffer_fb(enum pipe_format format, int samples); +st_new_renderbuffer_fb(enum pipe_format format, int samples, boolean sw); extern void st_init_fbo_functions(struct dd_function_table *functions); |