Merge commit 'origin/gallium-0.2' into gallium-master-merge

[mesa.git] / src / mesa / main / extensions.h

diff --git a/src/mesa/main/extensions.h b/src/mesa/main/extensions.h
index 8be86897991561a93951c1a74f1874231eaff434..05ad859a27ef595a252818aafe4e7606faa4e2e0 100644 (file)
--- a/src/mesa/main/extensions.h
+++ b/src/mesa/main/extensions.h
@@ -1,8 +1,18 @@
+/**
+ * \file extensions.h
+ * Extension handling.
+ * 
+ * \if subset
+ * (No-op)
+ *
+ * \endif
+ */
+
 /*
  * Mesa 3-D graphics library
- * Version:  5.1
+ * Version:  6.5.1
  *
- * Copyright (C) 1999-2003  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2006  Brian Paul   All Rights Reserved.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a
  * copy of this software and associated documentation files (the "Software"),
@@ -28,6 +38,7 @@
 
 #include "mtypes.h"
 
+#if _HAVE_FULL_GL
 
 extern void _mesa_enable_sw_extensions(GLcontext *ctx);
 
@@ -39,6 +50,10 @@ extern void _mesa_enable_1_4_extensions(GLcontext *ctx);
 
 extern void _mesa_enable_1_5_extensions(GLcontext *ctx);
 
+extern void _mesa_enable_2_0_extensions(GLcontext *ctx);
+
+extern void _mesa_enable_2_1_extensions(GLcontext *ctx);
+
 extern void _mesa_enable_extension(GLcontext *ctx, const char *name);
 
 extern void _mesa_disable_extension(GLcontext *ctx, const char *name);
@@ -49,4 +64,23 @@ extern void _mesa_init_extensions(GLcontext *ctx);
 
 extern GLubyte *_mesa_make_extension_string(GLcontext *ctx);
 
+#else
+
+/** No-op */
+#define _mesa_extensions_dtr( ctx ) ((void)0)
+
+/** No-op */
+#define _mesa_extensions_ctr( ctx ) ((void)0)
+
+/** No-op */
+#define _mesa_extensions_get_string( ctx ) "GL_EXT_texture_object"
+
+/** No-op */
+#define _mesa_enable_imaging_extensions( c ) ((void)0)
+
+/** No-op */
+#define _mesa_enable_extension( c, n ) ((void)0)
+
+#endif
+
 #endif