diff options
| author | marha <marha@users.sourceforge.net> | 2011-01-23 16:38:21 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-01-23 16:38:21 +0000 |
| commit | 174c4371f04f7a77979614fb7f3633807bd428ec (patch) | |
| tree | 32722d1e5ed3c6a42b63dbf9bf0248789d23a772 /mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | |
| parent | f544012f5c37fba02cae71b39a533f8296cdabb5 (diff) | |
| download | vcxsrv-174c4371f04f7a77979614fb7f3633807bd428ec.tar.gz vcxsrv-174c4371f04f7a77979614fb7f3633807bd428ec.tar.bz2 vcxsrv-174c4371f04f7a77979614fb7f3633807bd428ec.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mesa/state_tracker/st_atom_rasterizer.c')
| -rw-r--r-- | mesalib/src/mesa/state_tracker/st_atom_rasterizer.c | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c index 4936385d2..4fad1f297 100644 --- a/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c +++ b/mesalib/src/mesa/state_tracker/st_atom_rasterizer.c @@ -70,14 +70,16 @@ static void update_raster_state( struct st_context *st ) {
raster->front_ccw = (ctx->Polygon.FrontFace == GL_CCW);
- /* XXX
- * I think the intention here is that user-created framebuffer objects
- * use Y=0=TOP layout instead of OpenGL's normal Y=0=bottom layout.
- * Flipping Y changes CW to CCW and vice-versa.
- * But this is an implementation/driver-specific artifact - remove...
+ /*
+ * Gallium's surfaces are Y=0=TOP orientation. OpenGL is the
+ * opposite. Window system surfaces are Y=0=TOP. Mesa's FBOs
+ * must match OpenGL conventions so FBOs use Y=0=BOTTOM. In that
+ * case, we must invert Y and flip the notion of front vs. back.
*/
- if (ctx->DrawBuffer && ctx->DrawBuffer->Name != 0)
+ if (st_fb_orientation(ctx->DrawBuffer) == Y_0_BOTTOM) {
+ /* Drawing to an FBO. The viewport will be inverted. */
raster->front_ccw ^= 1;
+ }
}
/* _NEW_LIGHT
|