diff options
| author | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
|---|---|---|
| committer | Ben Skeggs <skeggsb@gmail.com> | 2008-01-16 13:14:19 +1100 |
| commit | 3119e9a14b66fcfb08fcc3563602273dd2e1893c (patch) | |
| tree | 74ff685faec3430b66d70522b6ed717f57e54f00 /src/mesa/pipe/p_defines.h | |
| parent | 9de335f5807553bc9251931ba3e80c4b454b5818 (diff) | |
| parent | 587e2becc237bc1c900a1c0ba114a1a0192690ff (diff) | |
Merge branch 'upstream-gallium-0.1' into darktama-gallium-0.1
Conflicts:
src/mesa/pipe/Makefile
Diffstat (limited to 'src/mesa/pipe/p_defines.h')
| -rw-r--r-- | src/mesa/pipe/p_defines.h | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/src/mesa/pipe/p_defines.h b/src/mesa/pipe/p_defines.h index a67ed60547..50bea691e7 100644 --- a/src/mesa/pipe/p_defines.h +++ b/src/mesa/pipe/p_defines.h @@ -115,10 +115,12 @@ #define PIPE_STENCIL_OP_INVERT 7 /** Texture types */ -#define PIPE_TEXTURE_1D 0 -#define PIPE_TEXTURE_2D 1 -#define PIPE_TEXTURE_3D 2 -#define PIPE_TEXTURE_CUBE 3 +enum pipe_texture_target { + PIPE_TEXTURE_1D = 0, + PIPE_TEXTURE_2D = 1, + PIPE_TEXTURE_3D = 2, + PIPE_TEXTURE_CUBE = 3 +}; #define PIPE_TEX_FACE_POS_X 0 #define PIPE_TEX_FACE_NEG_X 1 @@ -168,6 +170,14 @@ /** + * Surface status + */ +#define PIPE_SURFACE_STATUS_UNDEFINED 0 +#define PIPE_SURFACE_STATUS_DEFINED 1 +#define PIPE_SURFACE_STATUS_CLEAR 2 + + +/** * Buffer access flags */ #define PIPE_BUFFER_FLAG_READ 0x1 |