projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote branch 'origin/master' into gallium_draw_llvm
[mesa.git]
/
src
/
mesa
/
state_tracker
/
st_cb_fbo.h
diff --git
a/src/mesa/state_tracker/st_cb_fbo.h
b/src/mesa/state_tracker/st_cb_fbo.h
index fd77d0a95b04c76b1e643b4a8142e3ef7ec96a74..bea6eb89c3ecf0b7782df89757c37bc7efd7af6a 100644
(file)
--- 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 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.
/**
* 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? */
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;
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 *
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);
extern void
st_init_fbo_functions(struct dd_function_table *functions);