diff options
author | Tim Angus <tim@ngus.net> | 2006-05-06 17:18:02 +0000 |
---|---|---|
committer | Tim Angus <tim@ngus.net> | 2006-05-06 17:18:02 +0000 |
commit | bb7bd83aaec4504b4fb90919cccaaf4d9a7b418d (patch) | |
tree | a99058fef0dbf93af48dab4581b9f785d93e68ff /src/renderer/qgl.h | |
parent | bd9d761dd958aef00218de084bae00eb9bf788a4 (diff) |
* Merged ioq3-r775
- SDL_GammaRamp stuff
- Anisotropic texture filtering
- q3testesque r_flares
- cl_guid
- Security fixes
Diffstat (limited to 'src/renderer/qgl.h')
-rw-r--r-- | src/renderer/qgl.h | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/src/renderer/qgl.h b/src/renderer/qgl.h index e1945f8b..5bf52e13 100644 --- a/src/renderer/qgl.h +++ b/src/renderer/qgl.h @@ -92,11 +92,13 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA //=========================================================================== +// <Timbo> I hate this section so much /* ** multitexture extension definitions */ #if !defined(__sun) + #define GL_ACTIVE_TEXTURE_ARB 0x84E0 #define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 #define GL_MAX_ACTIVE_TEXTURES_ARB 0x84E2 @@ -105,10 +107,24 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA #define GL_TEXTURE1_ARB 0x84C1 #define GL_TEXTURE2_ARB 0x84C2 #define GL_TEXTURE3_ARB 0x84C3 + #else + #define GL_MAX_ACTIVE_TEXTURES_ARB 0x84E2 + #endif /* defined(__sun) */ +// anisotropic filtering constants +#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE +#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF + +// define for skyboxes without black seams on non SDL-versions. +#if !defined(GL_VERSION_1_2) && !defined(GL_CLAMP_TO_EDGE) + #define GL_CLAMP_TO_EDGE 0x812F +#endif + +//=========================================================================== + // NOTE: some Linux platforms would need those prototypes #if defined(MACOS_X) || ( defined(__sun) && defined(__sparc) ) typedef void (APIENTRY * PFNGLMULTITEXCOORD1DARBPROC) (GLenum target, GLdouble s); @@ -175,7 +191,7 @@ extern void ( APIENTRY * qglUnlockArraysEXT) (void); //=========================================================================== -// non-windows systems will just redefine qgl* to gl* +// non-dlopening systems will just redefine qgl* to gl* #if !defined( _WIN32 ) && !defined(MACOS_X) && !defined( __linux__ ) && !defined( __FreeBSD__ ) && !defined(__sun) // rb010123 #include "qgl_linked.h" |