diff options
| author | Brian Paul <brianp@vmware.com> | 2009-06-24 08:54:37 -0600 |
|---|---|---|
| committer | Brian Paul <brianp@vmware.com> | 2009-06-24 08:54:37 -0600 |
| commit | a04af335a42ce3b28e59ff9b85b2bd433a9d7b12 (patch) | |
| tree | 768262f4e8e4a9f49c64b76882c48f1ede445dd5 /src/mesa/main/mtypes.h | |
| parent | d60b2c68552a2729dfdb33c2bac4822453cf8ae2 (diff) | |
| parent | c25534f30d326c15dff845775d9bd55ba6064049 (diff) | |
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/drivers/dri/i915/i915_tex_layout.c
src/mesa/drivers/dri/i965/brw_wm_glsl.c
src/mesa/drivers/dri/intel/intel_buffer_objects.c
src/mesa/drivers/dri/intel/intel_pixel_bitmap.c
src/mesa/drivers/dri/intel/intel_pixel_draw.c
src/mesa/main/enums.c
src/mesa/main/texstate.c
src/mesa/vbo/vbo_exec_array.c
Diffstat (limited to 'src/mesa/main/mtypes.h')
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 0c071ee19a..d1614af736 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2979,6 +2979,8 @@ struct __GLcontextRec GLenum RenderMode; /**< either GL_RENDER, GL_SELECT, GL_FEEDBACK */ GLbitfield NewState; /**< bitwise-or of _NEW_* flags */ + GLboolean ViewportInitialized; /**< has viewport size been initialized? */ + GLbitfield varying_vp_inputs; /**< mask of VERT_BIT_* flags */ /** \name Derived state */ |