diff options
| author | Brian <brian@yutani.localnet.net> | 2007-03-09 11:43:53 -0700 |
|---|---|---|
| committer | Brian <brian@yutani.localnet.net> | 2007-03-09 11:43:53 -0700 |
| commit | 2cf5fd48d1586f961910a14324a457854cb66221 (patch) | |
| tree | 6b8690b1e3ac2b59369356d692214cc7d6a889c6 /src/mesa/main/mtypes.h | |
| parent | 9f44247acf62b91669f77974a4bbad687d58859e (diff) | |
| parent | f9f79c8d770e696249bd98c68b563f887562c974 (diff) | |
Merge branch 'origin' into glsl-compiler-1
Conflicts:
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 410d2d3144..b08e77ea88 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2316,6 +2316,7 @@ struct gl_framebuffer _glthread_Mutex Mutex; /**< for thread safety */ GLuint Name; /* if zero, this is a window system framebuffer */ GLint RefCount; + GLboolean DeletePending; GLvisual Visual; /**< The framebuffer's visual. Immutable if this is a window system buffer. @@ -2612,6 +2613,7 @@ struct gl_matrix_stack #define IMAGE_HISTOGRAM_BIT 0x200 #define IMAGE_MIN_MAX_BIT 0x400 #define IMAGE_CLAMP_BIT 0x800 /* extra */ +#define IMAGE_RED_TO_LUMINANCE 0x1000 /** Pixel Transfer ops up to convolution */ |