i915: reference __DRI_ATTRIB_SWAP_COPY token over the GLX one

[mesa.git] / src / mesa / drivers / dri / i915 / intel_fbo.h

diff --git a/src/mesa/drivers/dri/i915/intel_fbo.h b/src/mesa/drivers/dri/i915/intel_fbo.h
index 25a29d81eaf776388d9cb71a6b28dda0b3e9b02c..a30830b471e25058b8c8aecb66a36dcf0d61b0e1 100644 (file)
--- a/src/mesa/drivers/dri/i915/intel_fbo.h
+++ b/src/mesa/drivers/dri/i915/intel_fbo.h
@@ -36,10 +36,6 @@
 #include "intel_mipmap_tree.h"
 #include "intel_screen.h"
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 struct intel_context;
 struct intel_mipmap_tree;
 struct intel_texture_image;
@@ -85,14 +81,12 @@ struct intel_renderbuffer
  * NULL will be returned if the rb isn't really an intel_renderbuffer.
  * This is determined by checking the ClassID.
  */
-static INLINE struct intel_renderbuffer *
+static inline struct intel_renderbuffer *
 intel_renderbuffer(struct gl_renderbuffer *rb)
 {
    struct intel_renderbuffer *irb = (struct intel_renderbuffer *) rb;
-   if (irb && irb->Base.Base.ClassID == INTEL_RB_CLASS) {
-      /*_mesa_warning(NULL, "Returning non-intel Rb\n");*/
+   if (irb && irb->Base.Base.ClassID == INTEL_RB_CLASS)
       return irb;
-   }
    else
       return NULL;
 }
@@ -106,7 +100,7 @@ intel_renderbuffer(struct gl_renderbuffer *rb)
  * If the attached renderbuffer is a wrapper, then return wrapped
  * renderbuffer.
  */
-static INLINE struct intel_renderbuffer *
+static inline struct intel_renderbuffer *
 intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex)
 {
    struct gl_renderbuffer *rb;
@@ -121,7 +115,7 @@ intel_get_renderbuffer(struct gl_framebuffer *fb, gl_buffer_index attIndex)
 }
 
 
-static INLINE mesa_format
+static inline mesa_format
 intel_rb_format(const struct intel_renderbuffer *rb)
 {
    return rb->Base.Base.Format;
@@ -160,8 +154,4 @@ intel_renderbuffer_get_tile_offsets(struct intel_renderbuffer *irb,
 struct intel_region*
 intel_get_rb_region(struct gl_framebuffer *fb, GLuint attIndex);
 
-#ifdef __cplusplus
-}
-#endif
-
 #endif /* INTEL_FBO_H */