diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-05-06 07:45:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-05-06 07:45:28 +0100 |
| commit | 09e6be9b5782870f1f225653687e0d3e7be2a5a9 (patch) | |
| tree | 67215a913d51451b3a3d52f3f0815d4c81f4ff2b /src/gallium/include | |
| parent | 6361d6f48d13ce481253faf106fba5c6a41488ed (diff) | |
| parent | f77442fbd3b539aa3da927630c12c3a1a377f6da (diff) | |
Merge commit 'origin/gallium-0.1' into gallium-tex-surfaces
Conflicts:
src/mesa/state_tracker/st_atom_sampler.c
src/mesa/state_tracker/st_cb_texture.c
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_defines.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gallium/include/pipe/p_defines.h b/src/gallium/include/pipe/p_defines.h index 2e77fb42a8..83330ef22f 100644 --- a/src/gallium/include/pipe/p_defines.h +++ b/src/gallium/include/pipe/p_defines.h @@ -274,7 +274,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 } |