projects
/
mesa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove APIspec.dtd
[mesa.git]
/
src
/
mesa
/
swrast
/
s_points.c
diff --git
a/src/mesa/swrast/s_points.c
b/src/mesa/swrast/s_points.c
index 1663ece82941de2f5111a82453fe24f6edb06b12..acbdb2d42dd4b33a28b457c2302ef0c29ed8d791 100644
(file)
--- a/
src/mesa/swrast/s_points.c
+++ b/
src/mesa/swrast/s_points.c
@@
-25,7
+25,6
@@
#include "main/glheader.h"
#include "main/colormac.h"
#include "main/glheader.h"
#include "main/colormac.h"
-#include "main/context.h"
#include "main/macros.h"
#include "s_context.h"
#include "s_feedback.h"
#include "main/macros.h"
#include "s_context.h"
#include "s_feedback.h"
@@
-52,8
+51,8
@@
* or just the glPointSize value.
* Must also clamp to user-defined range and implmentation limits.
*/
* or just the glPointSize value.
* Must also clamp to user-defined range and implmentation limits.
*/
-static
INLINE
GLfloat
-get_size(const
GL
context *ctx, const SWvertex *vert, GLboolean smoothed)
+static
inline
GLfloat
+get_size(const
struct gl_
context *ctx, const SWvertex *vert, GLboolean smoothed)
{
GLfloat size;
{
GLfloat size;
@@
-81,7
+80,7
@@
get_size(const GLcontext *ctx, const SWvertex *vert, GLboolean smoothed)
* Draw a point sprite
*/
static void
* Draw a point sprite
*/
static void
-sprite_point(
GL
context *ctx, const SWvertex *vert)
+sprite_point(
struct gl_
context *ctx, const SWvertex *vert)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
@@
-241,7
+240,7
@@
sprite_point(GLcontext *ctx, const SWvertex *vert)
* Draw smooth/antialiased point. RGB or CI mode.
*/
static void
* Draw smooth/antialiased point. RGB or CI mode.
*/
static void
-smooth_point(
GL
context *ctx, const SWvertex *vert)
+smooth_point(
struct gl_
context *ctx, const SWvertex *vert)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
@@
-361,7
+360,7
@@
smooth_point(GLcontext *ctx, const SWvertex *vert)
* Draw large (size >= 1) non-AA point. RGB or CI mode.
*/
static void
* Draw large (size >= 1) non-AA point. RGB or CI mode.
*/
static void
-large_point(
GL
context *ctx, const SWvertex *vert)
+large_point(
struct gl_
context *ctx, const SWvertex *vert)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
SWspan span;
@@
-440,7
+439,7
@@
large_point(GLcontext *ctx, const SWvertex *vert)
span.end++;
}
}
span.end++;
}
}
- assert(span.end <= MAX_WIDTH);
+ assert(span.end <=
SWRAST_
MAX_WIDTH);
_swrast_write_rgba_span(ctx, &span);
}
}
_swrast_write_rgba_span(ctx, &span);
}
}
@@
-450,7
+449,7
@@
large_point(GLcontext *ctx, const SWvertex *vert)
* Draw size=1, single-pixel point
*/
static void
* Draw size=1, single-pixel point
*/
static void
-pixel_point(
GL
context *ctx, const SWvertex *vert)
+pixel_point(
struct gl_
context *ctx, const SWvertex *vert)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
/*
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
/*
@@
-476,7
+475,7
@@
pixel_point(GLcontext *ctx, const SWvertex *vert)
span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
/* check if we need to flush */
span->attrStepY[FRAG_ATTRIB_WPOS][3] = 0.0F;
/* check if we need to flush */
- if (span->end >= MAX_WIDTH ||
+ if (span->end >=
SWRAST_
MAX_WIDTH ||
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT)) ||
span->facing != swrast->PointLineFacing) {
if (span->end > 0) {
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT)) ||
span->facing != swrast->PointLineFacing) {
if (span->end > 0) {
@@
-505,7
+504,7
@@
pixel_point(GLcontext *ctx, const SWvertex *vert)
span->array->z[count] = (GLint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
span->end = count + 1;
span->array->z[count] = (GLint) (vert->attrib[FRAG_ATTRIB_WPOS][2] + 0.5F);
span->end = count + 1;
- ASSERT(span->end <= MAX_WIDTH);
+ ASSERT(span->end <=
SWRAST_
MAX_WIDTH);
}
}
@@
-514,7
+513,7
@@
pixel_point(GLcontext *ctx, const SWvertex *vert)
* primary color.
*/
void
* primary color.
*/
void
-_swrast_add_spec_terms_point(
GL
context *ctx, const SWvertex *v0)
+_swrast_add_spec_terms_point(
struct gl_
context *ctx, const SWvertex *v0)
{
SWvertex *ncv0 = (SWvertex *) v0; /* cast away const */
GLfloat rSum, gSum, bSum;
{
SWvertex *ncv0 = (SWvertex *) v0; /* cast away const */
GLfloat rSum, gSum, bSum;
@@
-540,7
+539,7
@@
_swrast_add_spec_terms_point(GLcontext *ctx, const SWvertex *v0)
* Examine current state to determine which point drawing function to use.
*/
void
* Examine current state to determine which point drawing function to use.
*/
void
-_swrast_choose_point(
GL
context *ctx)
+_swrast_choose_point(
struct gl_
context *ctx)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLfloat size = CLAMP(ctx->Point.Size,
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLfloat size = CLAMP(ctx->Point.Size,