Support ARB_texture_env_crossbar. Changes the way programs are

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

diff --git a/src/mesa/main/glheader.h b/src/mesa/main/glheader.h
index 65901c7b8183c1fb1028b208dfa84946a32068e0..0b1c16d2444c7813bf34e228999150ddeab1f06c 100644 (file)
--- a/src/mesa/main/glheader.h
+++ b/src/mesa/main/glheader.h
@@ -22,7 +22,7 @@
  * Mesa 3-D graphics library
  * Version:  6.3
  *
- * Copyright (C) 1999-2004  Brian Paul   All Rights Reserved.
+ * Copyright (C) 1999-2005  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"),
@@ -76,6 +76,13 @@
 #endif
 
 
+/* Get typedefs for uintptr_t and friends */
+#if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
+#include <BaseTsd.h>
+#else
+#include <inttypes.h>
+#endif
+
 #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
 #  define __WIN32__
 #  define finite _finite
@@ -102,33 +109,22 @@
 #    endif
 #  endif
 #  if (defined(_MSC_VER) || defined(__MINGW32__)) && defined(BUILD_GL32) /* tag specify we're building mesa as a DLL */
-#    define GLAPI __declspec(dllexport)
 #    define WGLAPI __declspec(dllexport)
 #  elif (defined(_MSC_VER) || defined(__MINGW32__)) && defined(_DLL) /* tag specifying we're building for DLL runtime support */
-#    define GLAPI __declspec(dllimport)
 #    define WGLAPI __declspec(dllimport)
 #  else /* for use with static link lib build of Win32 edition only */
-#    define GLAPI extern
 #    define WGLAPI __declspec(dllimport)
 #  endif /* _STATIC_MESA support */
-#  define GLAPIENTRY __stdcall
-#  define GLAPIENTRYP GLAPIENTRY *
-#elif !defined(BUILD_FOR_SNAP)
-/* non-Windows compilation */
-#  define GLAPI extern
-#  define GLAPIENTRY
-#  ifndef GLAPIENTRYP
-#    define GLAPIENTRYP *
-#  endif
 #endif /* WIN32 / CYGWIN bracket */
 
 
+#ifndef __MINGW32__
 /* XXX why is this here?
  * It should probaby be somewhere in src/mesa/drivers/windows/
  */
 /* compatibility guard so we don't need to change client code */
 #if defined(_WIN32) && !defined(_WINDEF_) && !defined(_WINDEF_H) && !defined(_GNU_H_WINDOWS32_BASE) && !defined(OPENSTEP) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP)
-typedef int (GLAPIENTRY *PROC)();
+typedef INT_PTR (GLAPIENTRY *PROC)();
 typedef unsigned long COLORREF;
 #endif
 
@@ -155,6 +151,7 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #include <GL/mesa_wgl.h>
 #endif
 #endif
+#endif /* !__MINGW32__ */
 
 
 /*
@@ -189,51 +186,6 @@ typedef struct tagPIXELFORMATDESCRIPTOR PIXELFORMATDESCRIPTOR, *PPIXELFORMATDESC
 #include <GL/internal/glcore.h>
 
 
-/* XXX temporary hack - remove when glext.h is updated */
-#ifndef GL_ARB_half_float_pixel
-#define GL_ARB_half_float_pixel 1
-#define GL_HALF_FLOAT_ARB 0x140B
-typedef GLushort GLhalfARB;
-#endif
-
-/* XXX temporary hack - remove when glext.h is updated */
-#ifndef GL_ARB_texture_float
-#define GL_ARB_texture_float 1
-#define GL_TEXTURE_RED_TYPE_ARB             0x9000
-#define GL_TEXTURE_GREEN_TYPE_ARB           0x9001
-#define GL_TEXTURE_BLUE_TYPE_ARB            0x9002
-#define GL_TEXTURE_ALPHA_TYPE_ARB           0x9003
-#define GL_TEXTURE_LUMINANCE_TYPE_ARB       0x9004
-#define GL_TEXTURE_INTENSITY_TYPE_ARB       0x9005
-#define GL_TEXTURE_DEPTH_TYPE_ARB           0x9006
-#define GL_UNSIGNED_NORMALIZED_ARB          0x9007
-#define GL_RGBA32F_ARB                      0x8814
-#define GL_RGB32F_ARB                       0x8815
-#define GL_ALPHA32F_ARB                     0x8816
-#define GL_INTENSITY32F_ARB                 0x8817
-#define GL_LUMINANCE32F_ARB                 0x8818
-#define GL_LUMINANCE_ALPHA32F_ARB           0x8819
-#define GL_RGBA16F_ARB                      0x881A
-#define GL_RGB16F_ARB                       0x881B
-#define GL_ALPHA16F_ARB                     0x881C
-#define GL_INTENSITY16F_ARB                 0x881D
-#define GL_LUMINANCE16F_ARB                 0x881E
-#define GL_LUMINANCE_ALPHA16F_ARB           0x881F
-#endif
-
-/* XXX temporary hack - remove when glext.h is updated */
-#ifndef GL_CURRENT_PROGRAM
-#define GL_CURRENT_PROGRAM             0x8B8D
-#define GL_POINT_SPRITE_COORD_ORIGIN   0x8CA0
-#define GL_LOWER_LEFT                  0x8CA1
-#define GL_UPPER_LEFT                  0x8CA2
-#define GL_STENCIL_BACK_REF            0x8CA3
-#define GL_STENCIL_BACK_VALUE_MASK     0x8CA4
-#define GL_STENCIL_BACK_WRITEMASK      0x8CA5
-#endif
-
-
-
 /* This is a macro on IRIX */
 #ifdef _P
 #undef _P
@@ -291,11 +243,16 @@ typedef GLushort GLhalfARB;
 
 /* If we build the library with gcc's -fvisibility=hidden flag, we'll
  * use the PUBLIC macro to mark functions that are to be exported.
+ *
+ * We also need to define a USED attribute, so the optimizer doesn't 
+ * inline a static function that we later use in an alias. - ajax
  */
 #if defined(__GNUC__) && (__GNUC__ * 100 + __GNUC_MINOR__) >= 303
 #  define PUBLIC __attribute__((visibility("default")))
+#  define USED __attribute__((used))
 #else
 #  define PUBLIC
+#  define USED
 #endif