summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2012-01-16 10:55:15 -0700
committerIan Romanick <ian.d.romanick@intel.com>2012-01-27 17:43:21 -0800
commitfee5f10241e8efd3f875b8721aa9515a33dce299 (patch)
tree2d3439c00ef12d5f9a4dec06a5c1db5dfacc5c4d
parent83eb5e43722cf0a6b3366ddf6a7ff3f8a44d4c23 (diff)
mesa: add new gl_renderbuffer fields
These are temporary, actually, but they'll make follow-on work easier to implement in a step-by-step manner. Eventually the Map and RowStrideBytes fields will go into a new swrast_renderbuffer type, but adding that type now would involve touching a _lot_ of code that'll eventually be removed. The fields marked as obsolete will go away completely at some point. (cherry picked from commit 827c1d66f671e50d9d96277b1fd3a59309626f66)
-rw-r--r--src/mesa/main/mtypes.h7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h
index 95450f92db0..99b6a6f0ab0 100644
--- a/src/mesa/main/mtypes.h
+++ b/src/mesa/main/mtypes.h
@@ -2528,7 +2528,6 @@ struct gl_renderbuffer
GLuint Name;
GLint RefCount;
GLuint Width, Height;
- GLint RowStride; /**< Padded width in units of pixels */
GLboolean Purgeable; /**< Is the buffer purgeable under memory pressure? */
GLboolean AttachedAnytime; /**< TRUE if it was attached to a framebuffer */
@@ -2540,9 +2539,15 @@ struct gl_renderbuffer
GL_STENCIL_INDEX. */
gl_format Format; /**< The actual renderbuffer memory format */
+ /* XXX the following 3 fields are obsolete and wil go away */
+ GLint RowStride; /**< Padded width in units of pixels */
GLenum DataType; /**< Type of values passed to the Get/Put functions */
GLvoid *Data; /**< This may not be used by some kinds of RBs */
+ /** The following fields are only valid while the buffer is mapped */
+ GLubyte *Map;
+ GLint RowStrideBytes;
+
/* Used to wrap one renderbuffer around another: */
struct gl_renderbuffer *Wrapped;