fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 07:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

just some reformatting

Browse source
This commit is contained in:
Brian Paul 2004-02-17 04:28:37 +00:00
parent 4250c7acac
commit 230ebaff2a
1 changed files with 17 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/mesa/swrast/s_triangle.c
View file

@ -1,8 +1,8 @@
/* /*
* Mesa 3-D graphics library * Mesa 3-D graphics library
* Version: 5.1 * Version: 6.1
* *
* Copyright (C) 1999-2003 Brian Paul All Rights Reserved. * Copyright (C) 1999-2004 Brian Paul All Rights Reserved.
* *
* Permission is hereby granted, free of charge, to any person obtaining a * Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"), * copy of this software and associated documentation files (the "Software"),
@ -49,10 +49,11 @@
/* /*
* Just used for feedback mode. * Just used for feedback mode.
*/ */
GLboolean _swrast_culltriangle( GLcontext *ctx, GLboolean
const SWvertex *v0, _swrast_culltriangle( GLcontext *ctx,
const SWvertex *v1, const SWvertex *v0,
const SWvertex *v2 ) const SWvertex *v1,
const SWvertex *v2 )
{ {
GLfloat ex = v1->win[0] - v0->win[0]; GLfloat ex = v1->win[0] - v0->win[0];
GLfloat ey = v1->win[1] - v0->win[1]; GLfloat ey = v1->win[1] - v0->win[1];
@ -156,7 +157,7 @@ GLboolean _swrast_culltriangle( GLcontext *ctx,
const GLint b = obj->BaseLevel; \ const GLint b = obj->BaseLevel; \
const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \ const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \
const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \ const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \
const GLint twidth_log2 = obj->Image[0][b]->WidthLog2; \ const GLint twidth_log2 = obj->Image[0][b]->WidthLog2; \
const GLchan *texture = (const GLchan *) obj->Image[0][b]->Data; \ const GLchan *texture = (const GLchan *) obj->Image[0][b]->Data; \
const GLint smask = obj->Image[0][b]->Width - 1; \ const GLint smask = obj->Image[0][b]->Width - 1; \
const GLint tmask = obj->Image[0][b]->Height - 1; \ const GLint tmask = obj->Image[0][b]->Height - 1; \
@ -207,7 +208,7 @@ GLboolean _swrast_culltriangle( GLcontext *ctx,
const GLint b = obj->BaseLevel; \ const GLint b = obj->BaseLevel; \
const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \ const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \
const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \ const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \
const GLint twidth_log2 = obj->Image[0][b]->WidthLog2; \ const GLint twidth_log2 = obj->Image[0][b]->WidthLog2; \
const GLchan *texture = (const GLchan *) obj->Image[0][b]->Data; \ const GLchan *texture = (const GLchan *) obj->Image[0][b]->Data; \
const GLint smask = obj->Image[0][b]->Width - 1; \ const GLint smask = obj->Image[0][b]->Width - 1; \
const GLint tmask = obj->Image[0][b]->Height - 1; \ const GLint tmask = obj->Image[0][b]->Height - 1; \
@ -540,11 +541,11 @@ affine_span(GLcontext *ctx, struct sw_span *span,
const GLint b = obj->BaseLevel; \ const GLint b = obj->BaseLevel; \
const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \ const GLfloat twidth = (GLfloat) obj->Image[0][b]->Width; \
const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \ const GLfloat theight = (GLfloat) obj->Image[0][b]->Height; \
info.texture = (const GLchan *) obj->Image[0][b]->Data; \ info.texture = (const GLchan *) obj->Image[0][b]->Data; \
info.twidth_log2 = obj->Image[0][b]->WidthLog2; \ info.twidth_log2 = obj->Image[0][b]->WidthLog2; \
info.smask = obj->Image[0][b]->Width - 1; \ info.smask = obj->Image[0][b]->Width - 1; \
info.tmask = obj->Image[0][b]->Height - 1; \ info.tmask = obj->Image[0][b]->Height - 1; \
info.format = obj->Image[0][b]->Format; \ info.format = obj->Image[0][b]->Format; \
info.filter = obj->MinFilter; \ info.filter = obj->MinFilter; \
info.envmode = unit->EnvMode; \ info.envmode = unit->EnvMode; \
span.arrayMask |= SPAN_RGBA; \ span.arrayMask |= SPAN_RGBA; \
@ -565,7 +566,7 @@ affine_span(GLcontext *ctx, struct sw_span *span,
case GL_ALPHA: \ case GL_ALPHA: \
case GL_LUMINANCE: \ case GL_LUMINANCE: \
case GL_INTENSITY: \ case GL_INTENSITY: \
info.tbytesline = obj->Image[0][b]->Width; \ info.tbytesline = obj->Image[0][b]->Width; \
break; \ break; \
case GL_LUMINANCE_ALPHA: \ case GL_LUMINANCE_ALPHA: \
info.tbytesline = obj->Image[0][b]->Width * 2; \ info.tbytesline = obj->Image[0][b]->Width * 2; \
@ -808,11 +809,11 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span,
const struct gl_texture_unit *unit = ctx->Texture.Unit+0; \ const struct gl_texture_unit *unit = ctx->Texture.Unit+0; \
const struct gl_texture_object *obj = unit->Current2D; \ const struct gl_texture_object *obj = unit->Current2D; \
const GLint b = obj->BaseLevel; \ const GLint b = obj->BaseLevel; \
info.texture = (const GLchan *) obj->Image[0][b]->Data; \ info.texture = (const GLchan *) obj->Image[0][b]->Data; \
info.twidth_log2 = obj->Image[0][b]->WidthLog2; \ info.twidth_log2 = obj->Image[0][b]->WidthLog2; \
info.smask = obj->Image[0][b]->Width - 1; \ info.smask = obj->Image[0][b]->Width - 1; \
info.tmask = obj->Image[0][b]->Height - 1; \ info.tmask = obj->Image[0][b]->Height - 1; \
info.format = obj->Image[0][b]->Format; \ info.format = obj->Image[0][b]->Format; \
info.filter = obj->MinFilter; \ info.filter = obj->MinFilter; \
info.envmode = unit->EnvMode; \ info.envmode = unit->EnvMode; \
\ \
@ -832,7 +833,7 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span,
case GL_ALPHA: \ case GL_ALPHA: \
case GL_LUMINANCE: \ case GL_LUMINANCE: \
case GL_INTENSITY: \ case GL_INTENSITY: \
info.tbytesline = obj->Image[0][b]->Width; \ info.tbytesline = obj->Image[0][b]->Width; \
break; \ break; \
case GL_LUMINANCE_ALPHA: \ case GL_LUMINANCE_ALPHA: \
info.tbytesline = obj->Image[0][b]->Width * 2; \ info.tbytesline = obj->Image[0][b]->Width * 2; \