Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline

[mesa.git] / src / mesa / drivers / dri / i965 / intel_context.h

diff --git a/src/mesa/drivers/dri/i965/intel_context.h b/src/mesa/drivers/dri/i965/intel_context.h
index 39eb775301747747d1d2ccb3ca664173c086c492..808512f7fd53ab37ba70933104dd51007b6e4a2a 100644 (file)
--- a/src/mesa/drivers/dri/i965/intel_context.h
+++ b/src/mesa/drivers/dri/i965/intel_context.h
@@ -177,7 +177,7 @@ struct intel_context
    GLuint second_last_swap_fence;
    
    GLboolean aub_wrap;
-   GLboolean stats_wm;
+   GLuint stats_wm;
 
    struct intel_batchbuffer *batch;
 
@@ -384,7 +384,7 @@ extern int INTEL_DEBUG;
 #define PCI_CHIP_I965_Q                        0x2992
 #define PCI_CHIP_I965_G_1              0x2982
 #define PCI_CHIP_I946_GZ               0x2972
-#define PCI_CHIP_CRESTLINE             0x2A02
+#define PCI_CHIP_I965_GM                0x2A02
 
 
 /* ================================================================
@@ -501,6 +501,7 @@ void intelBitmap(GLcontext * ctx,
                 const struct gl_pixelstore_attrib *unpack,
                 const GLubyte * pixels);
 
+void intelInitExtensions(GLcontext *ctx, GLboolean enable_imaging);
 #define _NEW_WINDOW_POS 0x40000000
 
 
@@ -523,6 +524,5 @@ static inline struct intel_texture_image *intel_texture_image( struct gl_texture
    return (struct intel_texture_image *)img;
 }
 
-
 #endif