diff options
| author | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-03-25 10:23:25 +0100 |
| commit | 30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea (patch) | |
| tree | 7ae924e3fb64c93a0f59e55fd08a914db9bb551b /mesalib/src/mesa/main/mtypes.h | |
| parent | 55a9a54c65cd0ff58966408ea4d7879a3d9c749c (diff) | |
| parent | 176eab9e8277db1549bfc6c9ae805c4e1858f0b0 (diff) | |
| download | vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.gz vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.tar.bz2 vcxsrv-30ac3efa02bbd1aecff4a0aa2da17bc886bdd5ea.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig mesa pixman xserver git update 25 Mar 2013
Diffstat (limited to 'mesalib/src/mesa/main/mtypes.h')
| -rw-r--r-- | mesalib/src/mesa/main/mtypes.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mesalib/src/mesa/main/mtypes.h b/mesalib/src/mesa/main/mtypes.h index 83b6c8984..a0e7e281d 100644 --- a/mesalib/src/mesa/main/mtypes.h +++ b/mesalib/src/mesa/main/mtypes.h @@ -1179,6 +1179,7 @@ struct gl_texture_object GLfloat Priority; /**< in [0,1] */ GLint BaseLevel; /**< min mipmap level, OpenGL 1.2 */ GLint MaxLevel; /**< max mipmap level, OpenGL 1.2 */ + GLint ImmutableLevels; /**< ES 3.0 / ARB_texture_view */ GLint _MaxLevel; /**< actual max mipmap level (q in the spec) */ GLfloat _MaxLambda; /**< = _MaxLevel - BaseLevel (q - b in spec) */ GLint CropRect[4]; /**< GL_OES_draw_texture */ @@ -1796,6 +1797,7 @@ struct gl_transform_feedback_state typedef enum { PROGRAM_TEMPORARY, /**< machine->Temporary[] */ + PROGRAM_ARRAY, /**< Arrays & Matrixes */ PROGRAM_INPUT, /**< machine->Inputs[] */ PROGRAM_OUTPUT, /**< machine->Outputs[] */ PROGRAM_LOCAL_PARAM, /**< gl_program->LocalParams[] */ |