diff options
| author | dok666 <dok666> | 2003-05-17 15:41:27 +0000 |
|---|---|---|
| committer | dok666 <dok666> | 2003-05-17 15:41:27 +0000 |
| commit | b51c721e84f6cd85014dd994f97fec145566c4da (patch) | |
| tree | 7d30c823f43f24575eafa57fa5d1aeaf9acbf637 | |
| parent | dd51e09ca667d411acb3e8d0493151608a98578b (diff) | |
In _mesa_set_viewport():
Call ctx->Driver.Viewport() after setting up ctx->Viewport._WindowMap,
at least the Matrox driver uses it in mgaViewport().
This fixes the broken 2D graphics in Quake3 I was writing about a few
days ago on the mailing list.
| -rw-r--r-- | src/mesa/main/matrix.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/mesa/main/matrix.c b/src/mesa/main/matrix.c index d4acd1d857..0d8932d458 100644 --- a/src/mesa/main/matrix.c +++ b/src/mesa/main/matrix.c @@ -32,7 +32,7 @@ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ -/* $Id: matrix.c,v 1.45.4.8 2003/03/24 18:23:32 keithw Exp $ */ +/* $Id: matrix.c,v 1.45.4.8.4.1 2003/05/17 15:41:27 dok666 Exp $ */ #include "glheader.h" @@ -45,6 +45,7 @@ #include "mmath.h" #include "mtypes.h" #include "math/m_matrix.h" +#include "math/m_xform.h" /** @@ -560,10 +561,6 @@ _mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, */ /* _mesa_ResizeBuffersMESA(); */ - if (ctx->Driver.Viewport) { - (*ctx->Driver.Viewport)( ctx, x, y, width, height ); - } - if (ctx->_RotateMode) { GLint tmp, tmps; tmp = x; x = y; y = tmp; @@ -584,6 +581,9 @@ _mesa_set_viewport( GLcontext *ctx, GLint x, GLint y, ctx->Viewport._WindowMap.type = MATRIX_3D_NO_ROT; ctx->NewState |= _NEW_VIEWPORT; + if (ctx->Driver.Viewport) { + (*ctx->Driver.Viewport)( ctx, x, y, width, height ); + } } |