diff options
| author | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:48:44 +0100 |
|---|---|---|
| committer | Luc Verhaegen <libv@skynet.be> | 2010-03-13 04:48:44 +0100 |
| commit | ed0beba0b514a7d4971345db2ff716aedd2892bb (patch) | |
| tree | 0e52f5286676d15b17c2eca216eaf4629ebc65b7 | |
| parent | 31cf9104d4a679eb625d5abf9e365b90b9f5efbf (diff) | |
DRI SDK headers from mesa 7.5.2.
| -rw-r--r-- | mesa/main/compiler.h | 8 | ||||
| -rw-r--r-- | mesa/main/config.h | 9 | ||||
| -rw-r--r-- | mesa/main/image.h | 6 |
3 files changed, 18 insertions, 5 deletions
diff --git a/mesa/main/compiler.h b/mesa/main/compiler.h index e79bbc2..9319505 100644 --- a/mesa/main/compiler.h +++ b/mesa/main/compiler.h @@ -110,10 +110,8 @@ extern "C" { #if defined(_WIN32) && !defined(__WIN32__) && !defined(__CYGWIN__) && !defined(BUILD_FOR_SNAP) # define __WIN32__ # define finite _finite -#endif -#if defined(__WATCOMC__) +#elif defined(__WATCOMC__) # define finite _finite -# pragma disable_message(201) /* Disable unreachable code warnings */ #endif @@ -135,6 +133,10 @@ extern "C" { # endif # endif #endif +#if defined(__WATCOMC__) +# pragma disable_message(201) /* Disable unreachable code warnings */ +#endif + /** diff --git a/mesa/main/config.h b/mesa/main/config.h index f7acd2f..1141190 100644 --- a/mesa/main/config.h +++ b/mesa/main/config.h @@ -138,9 +138,14 @@ /** * Maximum viewport/image width. Must accomodate all texture sizes too. */ -#define MAX_WIDTH 4096 + +#ifndef MAX_WIDTH +# define MAX_WIDTH 4096 +#endif /** Maximum viewport/image height */ -#define MAX_HEIGHT 4096 +#ifndef MAX_HEIGHT +# define MAX_HEIGHT 4096 +#endif /** Maxmimum size for CVA. May be overridden by the drivers. */ #define MAX_ARRAY_LOCK_SIZE 3000 diff --git a/mesa/main/image.h b/mesa/main/image.h index b26c27e..ee17acc 100644 --- a/mesa/main/image.h +++ b/mesa/main/image.h @@ -291,4 +291,10 @@ _mesa_clip_to_region(GLint xmin, GLint ymin, GLint *x, GLint *y, GLsizei *width, GLsizei *height ); +extern GLboolean +_mesa_clip_blit(GLcontext *ctx, + GLint *srcX0, GLint *srcY0, GLint *srcX1, GLint *srcY1, + GLint *dstX0, GLint *dstY0, GLint *dstX1, GLint *dstY1); + + #endif |