fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 16:00:24 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Cleaning

Browse source
This commit is contained in:
Jeremy Kolb 2006-04-14 22:50:14 +00:00
parent 4b2d8b46c8
commit 576b3433da
2 changed files with 15 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mesa/drivers/dri/nouveau/nouveau_context.h
View file

@ -54,6 +54,10 @@ nouveau_fifo;
#include "tnl_dd/t_dd_vertex.h"
#undef TAG
/* Subpixel offsets for window coordinates (triangles): */
#define SUBPIXEL_X (0.0F)
#define SUBPIXEL_Y (0.125F)
struct nouveau_context;
typedef void (*nouveau_tri_func)( struct nouveau_context*,
@ -121,7 +125,8 @@ typedef struct nouveau_context {
uint32_t vblank_flags;
GLfloat viewport[16];
GLmatrix viewport;
GLfloat depth_scale;
}nouveauContextRec, *nouveauContextPtr;

13
src/mesa/drivers/dri/nouveau/nouveau_state.c
View file

@ -40,10 +40,9 @@ static void nouveauCalcViewport(GLcontext *ctx)
{
/* Calculate the Viewport Matrix */
/* Taken from the intel driver
nouveauContextPtr nmesa = NOUVEAU_CONTEXT(ctx);
const GLfloat *v = ctx->Viewport._WindowMap.m;
GLfloat *m = nmesa->ViewportMatrix.m;
GLfloat *m = nmesa->viewport.m;
GLint h = 0;
if (nmesa->driDrawable)
@ -55,7 +54,7 @@ static void nouveauCalcViewport(GLcontext *ctx)
m[MAT_TY] = - v[MAT_TY] + h;
m[MAT_SZ] = v[MAT_SZ] * nmesa->depth_scale;
m[MAT_TZ] = v[MAT_TZ] * nmesa->depth_scale;
*/
}
static nouveauViewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
@ -75,7 +74,13 @@ static nouveauViewport(GLcontext *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
* 44c 0x03000000 <-- (Height_from_glViewport << 16) | (win_height - height - y)
*
*/
nouveauCalcViewport(ctx);
}
void nouveauDepthRange(GLcontext *ctx)
{
nouveauCalcViewport(ctx);
}
/* Initialize the context's hardware state. */
@ -120,7 +125,7 @@ void nouveauDDInitStateFuncs(GLcontext *ctx)
ctx->Driver.StencilMaskSeparate = NULL; //nouveauDDStencilMaskSeparate;
ctx->Driver.StencilOpSeparate = NULL; //nouveauDDStencilOpSeparate;
ctx->Driver.DepthRange = NULL; //nouveauDepthRange;
ctx->Driver.DepthRange = nouveauDepthRange;
ctx->Driver.Viewport = nouveauViewport;
/* Pixel path fallbacks.