diff options
| author | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-11-09 17:05:56 +0100 |
| commit | 72d7f8d5af476f12dc75eab4fa9d59364cbec190 (patch) | |
| tree | 1efac13a52811bfd28ae51538b15f87cbfaf8939 /mesalib/src/mesa/state_tracker/st_cb_fbo.h | |
| parent | a3d796bcc7de83fd88b42e09c6a82a8df4f9b836 (diff) | |
| parent | a8e5f06fe01732fbd643bc435dd3b8eaa602defe (diff) | |
| download | vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.gz vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.tar.bz2 vcxsrv-72d7f8d5af476f12dc75eab4fa9d59364cbec190.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mapi/glapi/glapi.h
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_cb_fbo.h')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_cb_fbo.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_cb_fbo.h b/mesalib/src/mesa/state_tracker/st_cb_fbo.h index 1afa3fe6e..1be017314 100644 --- a/mesalib/src/mesa/state_tracker/st_cb_fbo.h +++ b/mesalib/src/mesa/state_tracker/st_cb_fbo.h @@ -51,6 +51,8 @@ struct st_renderbuffer 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. */ |