diff options
| author | Eric Anholt <eric@anholt.net> | 2007-05-24 13:59:50 -0700 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2007-05-24 16:46:54 -0700 |
| commit | fd9d27e0686f5a15803d13d207e58be1972fdf31 (patch) | |
| tree | 79f8847e0fd723567032fa201d7b3ff2fdf5621d /src/mesa/drivers/dri/i915tex/intel_context.h | |
| parent | b1fcabefa2f3fa81a20c1556383458315bb49bbf (diff) | |
| parent | f116aed1ede0d802e9f3c5989290002975c00330 (diff) | |
Merge branch 'master' into i915-unification
Conflicts:
src/mesa/drivers/dri/i915tex/i830_texstate.c
src/mesa/drivers/dri/i915tex/i915_texstate.c
Diffstat (limited to 'src/mesa/drivers/dri/i915tex/intel_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/i915tex/intel_context.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/mesa/drivers/dri/i915tex/intel_context.h b/src/mesa/drivers/dri/i915tex/intel_context.h index d03c4c5dd1..a55f7d984e 100644 --- a/src/mesa/drivers/dri/i915tex/intel_context.h +++ b/src/mesa/drivers/dri/i915tex/intel_context.h @@ -91,6 +91,10 @@ struct intel_texture_object * regions will be copied to this region and the old storage freed. */ struct intel_mipmap_tree *mt; + + GLboolean imageOverride; + GLint depthOverride; + GLuint pitchOverride; }; @@ -388,7 +392,6 @@ extern GLboolean intelInitContext(struct intel_context *intel, extern void intelGetLock(struct intel_context *intel, GLuint flags); -extern void intelInitState(GLcontext * ctx); extern void intelFinish(GLcontext * ctx); extern void intelFlush(GLcontext * ctx); |