diff options
author | Brian Paul <brianp@vmware.com> | 2009-05-13 10:33:21 -0600 |
---|---|---|
committer | Brian Paul <brianp@vmware.com> | 2009-05-13 10:33:21 -0600 |
commit | 3039acfc5db67f3935f9c30a9f17193ab52b20a9 (patch) | |
tree | 49c770f360234977c1098e3d0c373da31ac7576c /src/mesa/drivers/dri/intel/intel_context.h | |
parent | 10c4a10b979bddd099287dec5b69243c2ade8ade (diff) | |
parent | 2e4e34689022ecfcc7dc107427db90cc52a94d63 (diff) |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/arrayobj.c
src/mesa/main/arrayobj.h
src/mesa/main/context.c
Diffstat (limited to 'src/mesa/drivers/dri/intel/intel_context.h')
-rw-r--r-- | src/mesa/drivers/dri/intel/intel_context.h | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/mesa/drivers/dri/intel/intel_context.h b/src/mesa/drivers/dri/intel/intel_context.h index c16732d7b5..e931e401e9 100644 --- a/src/mesa/drivers/dri/intel/intel_context.h +++ b/src/mesa/drivers/dri/intel/intel_context.h @@ -225,6 +225,14 @@ struct intel_context GLuint ClearColor565; GLuint ClearColor8888; + /* info for intel_clear_tris() */ + struct + { + struct gl_array_object *arrayObj; + GLfloat vertices[4][3]; + GLfloat color[4][4]; + } clear; + /* Offsets of fields within the current vertex: */ GLuint coloroffset; |