diff options
| author | marha <marha@users.sourceforge.net> | 2011-05-03 15:37:14 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-05-03 15:37:14 +0000 |
| commit | e4bd55e182560fa87af77ee3ec49fc1a907ead85 (patch) | |
| tree | f77ade9dac153a4f45e08ccaf260de8d8ddbbb17 /mesalib/src/mesa/program | |
| parent | e8af1ef3142aaaf2d17f2d3710e23eee1baf8a61 (diff) | |
| parent | cc93496bdbb3e7aea51033ece75fa85cfb5845d4 (diff) | |
| download | vcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.tar.gz vcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.tar.bz2 vcxsrv-e4bd55e182560fa87af77ee3ec49fc1a907ead85.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/program')
| -rw-r--r-- | mesalib/src/mesa/program/prog_statevars.c | 4 | ||||
| -rw-r--r-- | mesalib/src/mesa/program/prog_statevars.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mesalib/src/mesa/program/prog_statevars.c b/mesalib/src/mesa/program/prog_statevars.c index 348ace838..6a3752810 100644 --- a/mesalib/src/mesa/program/prog_statevars.c +++ b/mesalib/src/mesa/program/prog_statevars.c @@ -602,11 +602,11 @@ _mesa_fetch_state(struct gl_context *ctx, const gl_state_index state[], value[0] = 1.0F;
value[1] = 0.0F;
value[2] = -1.0F;
- value[3] = (GLfloat) (ctx->DrawBuffer->Height - 1);
+ value[3] = (GLfloat) ctx->DrawBuffer->Height;
} else {
/* Flipping Y upside down (XY) followed by identity (ZW). */
value[0] = -1.0F;
- value[1] = (GLfloat) (ctx->DrawBuffer->Height - 1);
+ value[1] = (GLfloat) ctx->DrawBuffer->Height;
value[2] = 1.0F;
value[3] = 0.0F;
}
diff --git a/mesalib/src/mesa/program/prog_statevars.h b/mesalib/src/mesa/program/prog_statevars.h index 53cb1d1c2..07e0a2798 100644 --- a/mesalib/src/mesa/program/prog_statevars.h +++ b/mesalib/src/mesa/program/prog_statevars.h @@ -120,7 +120,7 @@ typedef enum gl_state_index_ { STATE_PT_BIAS, /**< Pixel transfer RGBA bias */
STATE_SHADOW_AMBIENT, /**< ARB_shadow_ambient fail value; token[2] is texture unit index */
STATE_FB_SIZE, /**< (width-1, height-1, 0, 0) */
- STATE_FB_WPOS_Y_TRANSFORM, /**< (1, 0, -1, height-1) if a FBO is bound, (-1, height-1, 1, 0) otherwise */
+ STATE_FB_WPOS_Y_TRANSFORM, /**< (1, 0, -1, height) if a FBO is bound, (-1, height, 1, 0) otherwise */
STATE_ROT_MATRIX_0, /**< ATI_envmap_bumpmap, rot matrix row 0 */
STATE_ROT_MATRIX_1, /**< ATI_envmap_bumpmap, rot matrix row 1 */
STATE_INTERNAL_DRIVER /* first available state index for drivers (must be last) */
|