Merge branch 'nouveau-import'

[mesa.git] / src / mesa / drivers / dri / trident / trident_context.h

diff --git a/src/mesa/drivers/dri/trident/trident_context.h b/src/mesa/drivers/dri/trident/trident_context.h
index 74a3acb2ce1080725fa00b2dfad7d9e115b71991..b1e68b01663cb968b5a57ee5d55a83c5eb3f451d 100644 (file)
--- a/src/mesa/drivers/dri/trident/trident_context.h
+++ b/src/mesa/drivers/dri/trident/trident_context.h
@@ -117,6 +117,16 @@ typedef struct {
     tridentRegionRec mmio;
 } tridentScreenRec, *tridentScreenPtr;
 
+/**
+ * tridentRenderbuffer, derived from Mesa's gl_renderbuffer
+ */
+typedef struct {
+   struct gl_renderbuffer Base;
+   /* XXX per-window info should go here */
+   int foo, bar;
+} tridentRenderbuffer;
+
+
 struct trident_context {
        GLcontext               *glCtx;         /* Mesa context */
 
@@ -187,7 +197,7 @@ struct trident_context {
        struct gamma_texture_object_t SwappedOut; 
        GLenum TexEnvImageFmt[2];
 
-       memHeap_t *texHeap;
+       struct mem_block *texHeap;
 
        int lastSwap;
        int texAge;