diff options
| author | Ben Skeggs <[email protected]> | 2008-05-05 19:44:16 +1000 |
|---|---|---|
| committer | Ben Skeggs <[email protected]> | 2008-05-05 19:44:16 +1000 |
| commit | 33d9e213ee47aab32f662caf3e7c07c2697befbe (patch) | |
| tree | 20fd91d378d396e8e2ace51ee23722d98f212fcc /src/gallium/include/pipe/p_defines.h | |
| parent | 1e6191e0af2653aa69bd623e25d2e157662e560f (diff) | |
| parent | 736f535b4f1c5e6912b5b2fe9415a3b44a678844 (diff) | |
Merge remote branch 'upstream/gallium-0.1' into nouveau-gallium-0.1
Diffstat (limited to 'src/gallium/include/pipe/p_defines.h')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 586951d9566..46a355daa21 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -192,7 +192,7 @@ enum pipe_texture_target { #define PIPE_BUFFER_USAGE_VERTEX (1 << 5) #define PIPE_BUFFER_USAGE_INDEX (1 << 6) #define PIPE_BUFFER_USAGE_CONSTANT (1 << 7) -/** Pipe driver custam usage flags should be greater or equal to this value */ +/** Pipe driver custom usage flags should be greater or equal to this value */ #define PIPE_BUFFER_USAGE_CUSTOM (1 << 16) @@ -268,7 +268,7 @@ enum pipe_texture_target { #define PIPE_CAP_MAX_POINT_WIDTH_AA 17 #define PIPE_CAP_MAX_TEXTURE_ANISOTROPY 18 #define PIPE_CAP_MAX_TEXTURE_LOD_BIAS 19 -#define PIPE_CAP_BITMAP_TEXCOORD_BIAS 20 + #ifdef __cplusplus } |