diff options
| author | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:26:28 +0100 |
|---|---|---|
| committer | Keith Whitwell <keith@tungstengraphics.com> | 2008-10-10 15:26:28 +0100 |
| commit | 3a3801c1431203fc4dca24d56577995ae2e78956 (patch) | |
| tree | 7ec341b78ecc62dc1a238392aff828c363148d69 /src/mesa/drivers/dri/i915/i915_context.h | |
| parent | d7f1cb5b5a134b63227d5746a2dd1f05597c5c2f (diff) | |
| parent | 7216679c1998b49ff5b08e6b43f8d5779415bf54 (diff) | |
Merge commit 'origin/master' into gallium-0.2
Conflicts:
src/mesa/glapi/descrip.mms
src/mesa/shader/grammar/descrip.mms
Diffstat (limited to 'src/mesa/drivers/dri/i915/i915_context.h')
| -rw-r--r-- | src/mesa/drivers/dri/i915/i915_context.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/i915/i915_context.h b/src/mesa/drivers/dri/i915/i915_context.h index c6958dd8d4..a2376e50e1 100644 --- a/src/mesa/drivers/dri/i915/i915_context.h +++ b/src/mesa/drivers/dri/i915/i915_context.h @@ -125,6 +125,9 @@ struct i915_fragment_program GLboolean on_hardware; GLboolean error; /* If program is malformed for any reason. */ + /** Record of which phases R registers were last written in. */ + GLuint register_phases[16]; + GLuint indirections; GLuint nr_tex_indirect; GLuint nr_tex_insn; GLuint nr_alu_insn; |