projects
/
mesa.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
af1bfb7
)
replace _mesa_ prefix with _swrast_, remove s_histogram.[ch]
author
Brian Paul
<brian.paul@tungstengraphics.com>
Tue, 25 Mar 2003 02:23:44 +0000
(
02:23
+0000)
committer
Brian Paul
<brian.paul@tungstengraphics.com>
Tue, 25 Mar 2003 02:23:44 +0000
(
02:23
+0000)
45 files changed:
src/mesa/swrast/s_aalinetemp.h
patch
|
blob
|
history
src/mesa/swrast/s_aatriangle.c
patch
|
blob
|
history
src/mesa/swrast/s_aatriangle.h
patch
|
blob
|
history
src/mesa/swrast/s_aatritemp.h
patch
|
blob
|
history
src/mesa/swrast/s_accum.c
patch
|
blob
|
history
src/mesa/swrast/s_accum.h
patch
|
blob
|
history
src/mesa/swrast/s_alpha.c
patch
|
blob
|
history
src/mesa/swrast/s_alpha.h
patch
|
blob
|
history
src/mesa/swrast/s_alphabuf.c
patch
|
blob
|
history
src/mesa/swrast/s_alphabuf.h
patch
|
blob
|
history
src/mesa/swrast/s_bitmap.c
patch
|
blob
|
history
src/mesa/swrast/s_blend.c
patch
|
blob
|
history
src/mesa/swrast/s_blend.h
patch
|
blob
|
history
src/mesa/swrast/s_buffers.c
patch
|
blob
|
history
src/mesa/swrast/s_context.c
patch
|
blob
|
history
src/mesa/swrast/s_copypix.c
patch
|
blob
|
history
src/mesa/swrast/s_depth.c
patch
|
blob
|
history
src/mesa/swrast/s_depth.h
patch
|
blob
|
history
src/mesa/swrast/s_drawpix.c
patch
|
blob
|
history
src/mesa/swrast/s_drawpix.h
patch
|
blob
|
history
src/mesa/swrast/s_feedback.c
patch
|
blob
|
history
src/mesa/swrast/s_feedback.h
patch
|
blob
|
history
src/mesa/swrast/s_fog.c
patch
|
blob
|
history
src/mesa/swrast/s_fog.h
patch
|
blob
|
history
src/mesa/swrast/s_imaging.c
patch
|
blob
|
history
src/mesa/swrast/s_lines.c
patch
|
blob
|
history
src/mesa/swrast/s_linetemp.h
patch
|
blob
|
history
src/mesa/swrast/s_logic.c
patch
|
blob
|
history
src/mesa/swrast/s_logic.h
patch
|
blob
|
history
src/mesa/swrast/s_masking.c
patch
|
blob
|
history
src/mesa/swrast/s_masking.h
patch
|
blob
|
history
src/mesa/swrast/s_nvfragprog.c
patch
|
blob
|
history
src/mesa/swrast/s_points.c
patch
|
blob
|
history
src/mesa/swrast/s_pointtemp.h
patch
|
blob
|
history
src/mesa/swrast/s_readpix.c
patch
|
blob
|
history
src/mesa/swrast/s_span.c
patch
|
blob
|
history
src/mesa/swrast/s_span.h
patch
|
blob
|
history
src/mesa/swrast/s_stencil.c
patch
|
blob
|
history
src/mesa/swrast/s_stencil.h
patch
|
blob
|
history
src/mesa/swrast/s_texstore.c
patch
|
blob
|
history
src/mesa/swrast/s_triangle.c
patch
|
blob
|
history
src/mesa/swrast/s_triangle.h
patch
|
blob
|
history
src/mesa/swrast/s_tritemp.h
patch
|
blob
|
history
src/mesa/swrast/s_zoom.c
patch
|
blob
|
history
src/mesa/swrast/s_zoom.h
patch
|
blob
|
history
diff --git
a/src/mesa/swrast/s_aalinetemp.h
b/src/mesa/swrast/s_aalinetemp.h
index 9850ff9ac5ab4cb94adc713d1cb56ecfa860f4ca..13a825e7c00a2b884dfde79a651d7b0a33423876 100644
(file)
--- a/
src/mesa/swrast/s_aalinetemp.h
+++ b/
src/mesa/swrast/s_aalinetemp.h
@@
-1,4
+1,4
@@
-/* $Id: s_aalinetemp.h,v 1.2
3 2003/03/04 16:34:02
brianp Exp $ */
+/* $Id: s_aalinetemp.h,v 1.2
4 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-101,11
+101,11
@@
NAME(plot)(GLcontext *ctx, struct LineInfo *line, int ix, int iy)
if (line->span.end == MAX_WIDTH) {
#if defined(DO_TEX) || defined(DO_MULTITEX)
if (line->span.end == MAX_WIDTH) {
#if defined(DO_TEX) || defined(DO_MULTITEX)
- _
mesa
_write_texture_span(ctx, &(line->span));
+ _
swrast
_write_texture_span(ctx, &(line->span));
#elif defined(DO_RGBA)
#elif defined(DO_RGBA)
- _
mesa
_write_rgba_span(ctx, &(line->span));
+ _
swrast
_write_rgba_span(ctx, &(line->span));
#else
#else
- _
mesa
_write_index_span(ctx, &(line->span));
+ _
swrast
_write_index_span(ctx, &(line->span));
#endif
line->span.end = 0; /* reset counter */
}
#endif
line->span.end = 0; /* reset counter */
}
@@
-294,11
+294,11
@@
NAME(line)(GLcontext *ctx, const SWvertex *v0, const SWvertex *v1)
}
#if defined(DO_TEX) || defined(DO_MULTITEX)
}
#if defined(DO_TEX) || defined(DO_MULTITEX)
- _
mesa
_write_texture_span(ctx, &(line.span));
+ _
swrast
_write_texture_span(ctx, &(line.span));
#elif defined(DO_RGBA)
#elif defined(DO_RGBA)
- _
mesa
_write_rgba_span(ctx, &(line.span));
+ _
swrast
_write_rgba_span(ctx, &(line.span));
#else
#else
- _
mesa
_write_index_span(ctx, &(line.span));
+ _
swrast
_write_index_span(ctx, &(line.span));
#endif
}
#endif
}
diff --git
a/src/mesa/swrast/s_aatriangle.c
b/src/mesa/swrast/s_aatriangle.c
index 7b41573a4eefaf3e7c0760789689c8764609ba56..b717ee777416162a2f1dff8592a3853ce0c5e7ba 100644
(file)
--- a/
src/mesa/swrast/s_aatriangle.c
+++ b/
src/mesa/swrast/s_aatriangle.c
@@
-1,4
+1,4
@@
-/* $Id: s_aatriangle.c,v 1.3
0 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_aatriangle.c,v 1.3
1 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-461,7
+461,7
@@
spec_multitex_aa_tri(GLcontext *ctx,
* appropriate antialiased triangle rasterizer function.
*/
void
* appropriate antialiased triangle rasterizer function.
*/
void
-_
mesa
_set_aa_triangle_function(GLcontext *ctx)
+_
swrast
_set_aa_triangle_function(GLcontext *ctx)
{
ASSERT(ctx->Polygon.SmoothFlag);
{
ASSERT(ctx->Polygon.SmoothFlag);
diff --git
a/src/mesa/swrast/s_aatriangle.h
b/src/mesa/swrast/s_aatriangle.h
index 0e25414e65d473deb71008df93bc1accaefafd2d..af723086d4179201ca6e80ced1a8cada26518913 100644
(file)
--- a/
src/mesa/swrast/s_aatriangle.h
+++ b/
src/mesa/swrast/s_aatriangle.h
@@
-1,4
+1,4
@@
-/* $Id: s_aatriangle.h,v 1.
3 2001/03/12 00:48:41 gareth
Exp $ */
+/* $Id: s_aatriangle.h,v 1.
4 2003/03/25 02:23:44 brianp
Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,7
+34,7
@@
extern void
extern void
-_
mesa
_set_aa_triangle_function(GLcontext *ctx);
+_
swrast
_set_aa_triangle_function(GLcontext *ctx);
#endif
#endif
diff --git
a/src/mesa/swrast/s_aatritemp.h
b/src/mesa/swrast/s_aatritemp.h
index 1b4df7537195a178500a74c49608a7e9e3b5d8d9..0ffba71f3e334b88604cda138593f868ca891e95 100644
(file)
--- a/
src/mesa/swrast/s_aatritemp.h
+++ b/
src/mesa/swrast/s_aatritemp.h
@@
-1,4
+1,4
@@
-/* $Id: s_aatritemp.h,v 1.3
5 2003/02/21 21:00:20
brianp Exp $ */
+/* $Id: s_aatritemp.h,v 1.3
6 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-350,11
+350,11
@@
span.end = (GLuint) ix - (GLuint) startX;
ASSERT(span.interpMask == 0);
#if defined(DO_MULTITEX) || defined(DO_TEX)
span.end = (GLuint) ix - (GLuint) startX;
ASSERT(span.interpMask == 0);
#if defined(DO_MULTITEX) || defined(DO_TEX)
- _
mesa
_write_texture_span(ctx, &span);
+ _
swrast
_write_texture_span(ctx, &span);
#elif defined(DO_RGBA)
#elif defined(DO_RGBA)
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
#elif defined(DO_INDEX)
#elif defined(DO_INDEX)
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
#endif
}
}
#endif
}
}
@@
-511,11
+511,11
@@
span.end = n;
ASSERT(span.interpMask == 0);
#if defined(DO_MULTITEX) || defined(DO_TEX)
span.end = n;
ASSERT(span.interpMask == 0);
#if defined(DO_MULTITEX) || defined(DO_TEX)
- _
mesa
_write_texture_span(ctx, &span);
+ _
swrast
_write_texture_span(ctx, &span);
#elif defined(DO_RGBA)
#elif defined(DO_RGBA)
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
#elif defined(DO_INDEX)
#elif defined(DO_INDEX)
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
#endif
}
}
#endif
}
}
diff --git
a/src/mesa/swrast/s_accum.c
b/src/mesa/swrast/s_accum.c
index 2af2714bd67e103571f740a8309a9dae96bdd1e3..0dfe93bb6bd2ad40e89a1a37de9eefb8ac3517d8 100644
(file)
--- a/
src/mesa/swrast/s_accum.c
+++ b/
src/mesa/swrast/s_accum.c
@@
-1,4
+1,4
@@
-/* $Id: s_accum.c,v 1.2
1 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_accum.c,v 1.2
2 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-67,7
+67,7
@@
void
void
-_
mesa
_alloc_accum_buffer( GLframebuffer *buffer )
+_
swrast
_alloc_accum_buffer( GLframebuffer *buffer )
{
GET_CURRENT_CONTEXT(ctx);
GLint n;
{
GET_CURRENT_CONTEXT(ctx);
GLint n;
@@
-130,7
+130,7
@@
static void rescale_accum( GLcontext *ctx )
* Clear the accumulation Buffer.
*/
void
* Clear the accumulation Buffer.
*/
void
-_
mesa
_clear_accum_buffer( GLcontext *ctx )
+_
swarst
_clear_accum_buffer( GLcontext *ctx )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint buffersize;
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint buffersize;
@@
-325,7
+325,7
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
for (j = 0; j < height; j++) {
GLint i, i4;
for (j = 0; j < height; j++) {
GLint i, i4;
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
for (i = i4 = 0; i < width; i++, i4+=4) {
acc[i4+0] += rgba[i][RCOMP];
acc[i4+1] += rgba[i][GCOMP];
for (i = i4 = 0; i < width; i++, i4+=4) {
acc[i4+0] += rgba[i][RCOMP];
acc[i4+1] += rgba[i][GCOMP];
@@
-346,7
+346,7
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
for (j=0;j<height;j++) {
GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
GLint i;
for (j=0;j<height;j++) {
GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
GLint i;
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
for (i=0;i<width;i++) {
acc[0] += (GLaccum) ( (GLfloat) rgba[i][RCOMP] * rscale );
acc[1] += (GLaccum) ( (GLfloat) rgba[i][GCOMP] * gscale );
for (i=0;i<width;i++) {
acc[0] += (GLaccum) ( (GLfloat) rgba[i][RCOMP] * rscale );
acc[1] += (GLaccum) ( (GLfloat) rgba[i][GCOMP] * gscale );
@@
-389,7
+389,7
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
assert(swrast->_IntegerAccumScaler <= 1.0);
for (j = 0; j < height; j++) {
GLint i, i4;
assert(swrast->_IntegerAccumScaler <= 1.0);
for (j = 0; j < height; j++) {
GLint i, i4;
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
for (i = i4 = 0; i < width; i++, i4 += 4) {
acc[i4+0] = rgba[i][RCOMP];
acc[i4+1] = rgba[i][GCOMP];
for (i = i4 = 0; i < width; i++, i4 += 4) {
acc[i4+0] = rgba[i][RCOMP];
acc[i4+1] = rgba[i][GCOMP];
@@
-412,7
+412,7
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
GLint i, j;
for (j = 0; j < height; j++) {
GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
GLint i, j;
for (j = 0; j < height; j++) {
GLaccum *acc = ctx->DrawBuffer->Accum + ypos * width4 + xpos * 4;
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, width, xpos, ypos, rgba);
for (i=0;i<width;i++) {
#if 0
*acc++ = (GLaccum) ((GLfloat) rgba[i][RCOMP] * rscale + d);
for (i=0;i<width;i++) {
#if 0
*acc++ = (GLaccum) ((GLfloat) rgba[i][RCOMP] * rscale + d);
@@
-472,13
+472,13
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
rgba[i][ACOMP] = multTable[acc[i4+3]];
}
if (colorMask != 0xffffffff) {
rgba[i][ACOMP] = multTable[acc[i4+3]];
}
if (colorMask != 0xffffffff) {
- _
mesa
_mask_rgba_array( ctx, width, xpos, ypos, rgba );
+ _
swrast
_mask_rgba_array( ctx, width, xpos, ypos, rgba );
}
(*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLchan (*)[4])rgba, NULL );
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
}
(*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLchan (*)[4])rgba, NULL );
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
- _
mesa
_write_alpha_span(ctx, width, xpos, ypos,
+ _
swrast
_write_alpha_span(ctx, width, xpos, ypos,
(CONST GLchan (*)[4]) rgba, NULL);
}
ypos++;
(CONST GLchan (*)[4]) rgba, NULL);
}
ypos++;
@@
-507,13
+507,13
@@
_swrast_Accum( GLcontext *ctx, GLenum op, GLfloat value,
rgba[i][ACOMP] = CLAMP( a, 0, CHAN_MAX );
}
if (colorMask != 0xffffffff) {
rgba[i][ACOMP] = CLAMP( a, 0, CHAN_MAX );
}
if (colorMask != 0xffffffff) {
- _
mesa
_mask_rgba_array( ctx, width, xpos, ypos, rgba );
+ _
swrast
_mask_rgba_array( ctx, width, xpos, ypos, rgba );
}
(*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLchan (*)[4])rgba, NULL );
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
}
(*swrast->Driver.WriteRGBASpan)( ctx, width, xpos, ypos,
(const GLchan (*)[4])rgba, NULL );
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
- _
mesa
_write_alpha_span(ctx, width, xpos, ypos,
+ _
swrast
_write_alpha_span(ctx, width, xpos, ypos,
(CONST GLchan (*)[4]) rgba, NULL);
}
ypos++;
(CONST GLchan (*)[4]) rgba, NULL);
}
ypos++;
diff --git
a/src/mesa/swrast/s_accum.h
b/src/mesa/swrast/s_accum.h
index d46235d5e3e66286f0b91be2c820df8d49e58294..62b11825d4e6d5e32b2c84b8397c710899ba5955 100644
(file)
--- a/
src/mesa/swrast/s_accum.h
+++ b/
src/mesa/swrast/s_accum.h
@@
-1,4
+1,4
@@
-/* $Id: s_accum.h,v 1.
4 2002/03/16 00:53:15
brianp Exp $ */
+/* $Id: s_accum.h,v 1.
5 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,11
+34,11
@@
extern void
extern void
-_
mesa
_alloc_accum_buffer( GLframebuffer *buffer );
+_
swrast
_alloc_accum_buffer( GLframebuffer *buffer );
extern void
extern void
-_
mesa
_clear_accum_buffer( GLcontext *ctx );
+_
swarst
_clear_accum_buffer( GLcontext *ctx );
#endif
#endif
diff --git
a/src/mesa/swrast/s_alpha.c
b/src/mesa/swrast/s_alpha.c
index 35ec7e9dcce91939b34188aeab99584549b81d72..9ad3ea3b1278c7314d43334f7b98678231b3d0d1 100644
(file)
--- a/
src/mesa/swrast/s_alpha.c
+++ b/
src/mesa/swrast/s_alpha.c
@@
-1,4
+1,4
@@
-/* $Id: s_alpha.c,v 1.1
3 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_alpha.c,v 1.1
4 2003/03/25 02:23:44
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-39,14
+39,14
@@
/**
/**
- * \fn GLint _
mesa
_alpha_test( const GLcontext *ctx, struct sw_span *span )
+ * \fn GLint _
swrast
_alpha_test( const GLcontext *ctx, struct sw_span *span )
* \brief Apply the alpha test to a span of pixels.
* \return
* - "0" = all pixels in the span failed the alpha test.
* - "1" = one or more pixels passed the alpha test.
*/
GLint
* \brief Apply the alpha test to a span of pixels.
* \return
* - "0" = all pixels in the span failed the alpha test.
* - "1" = one or more pixels passed the alpha test.
*/
GLint
-_
mesa
_alpha_test( const GLcontext *ctx, struct sw_span *span )
+_
swrast
_alpha_test( const GLcontext *ctx, struct sw_span *span )
{
const GLchan (*rgba)[4] = (const GLchan (*)[4]) span->array->rgba;
GLchan ref;
{
const GLchan (*rgba)[4] = (const GLchan (*)[4]) span->array->rgba;
GLchan ref;
@@
-91,7
+91,7
@@
_mesa_alpha_test( const GLcontext *ctx, struct sw_span *span )
span->writeAll = GL_FALSE;
return 0;
default:
span->writeAll = GL_FALSE;
return 0;
default:
- _mesa_problem( ctx, "Invalid alpha test in _
mesa
_alpha_test" );
+ _mesa_problem( ctx, "Invalid alpha test in _
swrast
_alpha_test" );
return 0;
}
}
return 0;
}
}
diff --git
a/src/mesa/swrast/s_alpha.h
b/src/mesa/swrast/s_alpha.h
index 413babb3e9982d66f0ef7318be83e7bd67903e1a..cf69223b9eddba4e034e78ad1c2356cdfdc89799 100644
(file)
--- a/
src/mesa/swrast/s_alpha.h
+++ b/
src/mesa/swrast/s_alpha.h
@@
-1,4
+1,4
@@
-/* $Id: s_alpha.h,v 1.
7 2003/02/23 04:10:5
4 brianp Exp $ */
+/* $Id: s_alpha.h,v 1.
8 2003/03/25 02:23:4
4 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,7
+34,7
@@
extern GLint
extern GLint
-_
mesa
_alpha_test( const GLcontext *ctx, struct sw_span *span );
+_
swrast
_alpha_test( const GLcontext *ctx, struct sw_span *span );
#endif
#endif
diff --git
a/src/mesa/swrast/s_alphabuf.c
b/src/mesa/swrast/s_alphabuf.c
index 0c82055721c6f49c34895c64164cede6ebf72da7..31812769d5c3711f13d8513cbfade90d622f12df 100644
(file)
--- a/
src/mesa/swrast/s_alphabuf.c
+++ b/
src/mesa/swrast/s_alphabuf.c
@@
-1,4
+1,4
@@
-/* $Id: s_alphabuf.c,v 1.1
6 2002/11/26 02:58:43
brianp Exp $ */
+/* $Id: s_alphabuf.c,v 1.1
7 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-44,7
+44,7
@@
* Allocate a new front and back alpha buffer.
*/
void
* Allocate a new front and back alpha buffer.
*/
void
-_
mesa
_alloc_alpha_buffers( GLframebuffer *buffer )
+_
swrast
_alloc_alpha_buffers( GLframebuffer *buffer )
{
const GLint bytes = buffer->Width * buffer->Height * sizeof(GLchan);
{
const GLint bytes = buffer->Width * buffer->Height * sizeof(GLchan);
@@
-102,7
+102,7
@@
_mesa_alloc_alpha_buffers( GLframebuffer *buffer )
* Clear all the alpha buffers
*/
void
* Clear all the alpha buffers
*/
void
-_
mesa
_clear_alpha_buffers( GLcontext *ctx )
+_
swrast
_clear_alpha_buffers( GLcontext *ctx )
{
GLchan aclear;
GLuint bufferBit;
{
GLchan aclear;
GLuint bufferBit;
@@
-198,7
+198,7
@@
GLchan *get_alpha_buffer( GLcontext *ctx )
void
void
-_
mesa
_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_
swrast
_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
CONST GLchan rgba[][4], const GLubyte mask[] )
{
GLchan *buffer, *aptr;
CONST GLchan rgba[][4], const GLubyte mask[] )
{
GLchan *buffer, *aptr;
@@
-224,7
+224,7
@@
_mesa_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
void
void
-_
mesa
_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_
swrast
_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
GLchan alpha, const GLubyte mask[] )
{
GLchan *buffer, *aptr;
GLchan alpha, const GLubyte mask[] )
{
GLchan *buffer, *aptr;
@@
-250,7
+250,7
@@
_mesa_write_mono_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
void
void
-_
mesa
_write_alpha_pixels( GLcontext *ctx,
+_
swrast
_write_alpha_pixels( GLcontext *ctx,
GLuint n, const GLint x[], const GLint y[],
CONST GLchan rgba[][4], const GLubyte mask[] )
{
GLuint n, const GLint x[], const GLint y[],
CONST GLchan rgba[][4], const GLubyte mask[] )
{
@@
-277,7
+277,7
@@
_mesa_write_alpha_pixels( GLcontext *ctx,
void
void
-_
mesa
_write_mono_alpha_pixels( GLcontext *ctx,
+_
swrast
_write_mono_alpha_pixels( GLcontext *ctx,
GLuint n, const GLint x[], const GLint y[],
GLchan alpha, const GLubyte mask[] )
{
GLuint n, const GLint x[], const GLint y[],
GLchan alpha, const GLubyte mask[] )
{
@@
-305,7
+305,7
@@
_mesa_write_mono_alpha_pixels( GLcontext *ctx,
void
void
-_
mesa
_read_alpha_span( GLcontext *ctx,
+_
swrast
_read_alpha_span( GLcontext *ctx,
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
const GLchan *buffer, *aptr;
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
const GLchan *buffer, *aptr;
@@
-320,7
+320,7
@@
_mesa_read_alpha_span( GLcontext *ctx,
void
void
-_
mesa
_read_alpha_pixels( GLcontext *ctx,
+_
swrast
_read_alpha_pixels( GLcontext *ctx,
GLuint n, const GLint x[], const GLint y[],
GLchan rgba[][4], const GLubyte mask[] )
{
GLuint n, const GLint x[], const GLint y[],
GLchan rgba[][4], const GLubyte mask[] )
{
diff --git
a/src/mesa/swrast/s_alphabuf.h
b/src/mesa/swrast/s_alphabuf.h
index 544ae070b1656c9436cc49da837c9880364e737d..d74db0114b31aa7d39b90c9662b1285f9410b495 100644
(file)
--- a/
src/mesa/swrast/s_alphabuf.h
+++ b/
src/mesa/swrast/s_alphabuf.h
@@
-1,4
+1,4
@@
-/* $Id: s_alphabuf.h,v 1.
4 2002/03/16 00:53:1
5 brianp Exp $ */
+/* $Id: s_alphabuf.h,v 1.
5 2003/03/25 02:23:4
5 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,46
+34,46
@@
extern void
extern void
-_
mesa
_alloc_alpha_buffers( GLframebuffer *buffer );
+_
swrast
_alloc_alpha_buffers( GLframebuffer *buffer );
extern void
extern void
-_
mesa
_clear_alpha_buffers( GLcontext *ctx );
+_
swrast
_clear_alpha_buffers( GLcontext *ctx );
extern void
extern void
-_
mesa
_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_
swrast
_write_alpha_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
CONST GLchan rgba[][4], const GLubyte mask[] );
extern void
CONST GLchan rgba[][4], const GLubyte mask[] );
extern void
-_
mesa
_write_mono_alpha_span( GLcontext *ctx,
+_
swrast
_write_mono_alpha_span( GLcontext *ctx,
GLuint n, GLint x, GLint y,
GLchan alpha, const GLubyte mask[] );
extern void
GLuint n, GLint x, GLint y,
GLchan alpha, const GLubyte mask[] );
extern void
-_
mesa
_write_alpha_pixels( GLcontext* ctx,
+_
swrast
_write_alpha_pixels( GLcontext* ctx,
GLuint n, const GLint x[], const GLint y[],
CONST GLchan rgba[][4],
const GLubyte mask[] );
extern void
GLuint n, const GLint x[], const GLint y[],
CONST GLchan rgba[][4],
const GLubyte mask[] );
extern void
-_
mesa
_write_mono_alpha_pixels( GLcontext* ctx,
+_
swrast
_write_mono_alpha_pixels( GLcontext* ctx,
GLuint n, const GLint x[],
const GLint y[], GLchan alpha,
const GLubyte mask[] );
extern void
GLuint n, const GLint x[],
const GLint y[], GLchan alpha,
const GLubyte mask[] );
extern void
-_
mesa
_read_alpha_span( GLcontext* ctx,
+_
swrast
_read_alpha_span( GLcontext* ctx,
GLuint n, GLint x, GLint y, GLchan rgba[][4] );
extern void
GLuint n, GLint x, GLint y, GLchan rgba[][4] );
extern void
-_
mesa
_read_alpha_pixels( GLcontext* ctx,
+_
swrast
_read_alpha_pixels( GLcontext* ctx,
GLuint n, const GLint x[], const GLint y[],
GLchan rgba[][4], const GLubyte mask[] );
GLuint n, const GLint x[], const GLint y[],
GLchan rgba[][4], const GLubyte mask[] );
diff --git
a/src/mesa/swrast/s_bitmap.c
b/src/mesa/swrast/s_bitmap.c
index 49cc59ceefcf684b93ae106a0739428f2cac4b0d..f8fc0710994b84b0311270e155a49ba98f6a9b43 100644
(file)
--- a/
src/mesa/swrast/s_bitmap.c
+++ b/
src/mesa/swrast/s_bitmap.c
@@
-1,4
+1,4
@@
-/* $Id: s_bitmap.c,v 1.2
1 2003/03/01 01:50:2
5 brianp Exp $ */
+/* $Id: s_bitmap.c,v 1.2
2 2003/03/25 02:23:4
5 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-79,11
+79,11
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
if (ctx->Depth.Test)
}
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (ctx->Texture._EnabledUnits)
if (ctx->Texture._EnabledUnits)
- _
mesa
_span_default_texcoords(ctx, &span);
+ _
swrast
_span_default_texcoords(ctx, &span);
for (row = 0; row < height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
for (row = 0; row < height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
@@
-138,9
+138,9
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
/* flush the span */
span.end = count;
if (ctx->Visual.rgbMode)
/* flush the span */
span.end = count;
if (ctx->Visual.rgbMode)
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
span.end = 0;
count = 0;
}
span.end = 0;
count = 0;
}
@@
-195,11
+195,11
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
if (ctx->Depth.Test)
}
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (ctx->Texture._EnabledUnits)
if (ctx->Texture._EnabledUnits)
- _
mesa
_span_default_texcoords(ctx, &span);
+ _
swrast
_span_default_texcoords(ctx, &span);
for (row=0; row<height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
for (row=0; row<height; row++, span.y++) {
const GLubyte *src = (const GLubyte *) _mesa_image_address( unpack,
@@
-220,9
+220,9
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
if (ctx->Visual.rgbMode)
}
if (ctx->Visual.rgbMode)
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
/* get ready for next row */
if (mask != 1)
/* get ready for next row */
if (mask != 1)
@@
-243,9
+243,9
@@
_swrast_Bitmap( GLcontext *ctx, GLint px, GLint py,
}
if (ctx->Visual.rgbMode)
}
if (ctx->Visual.rgbMode)
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
/* get ready for next row */
if (mask != 128)
/* get ready for next row */
if (mask != 128)
diff --git
a/src/mesa/swrast/s_blend.c
b/src/mesa/swrast/s_blend.c
index 5afc6a030c159f489f943aa344dbfb2a43cd6959..2e98b5f21b7377413fad08b5a9cffaf4b73ff1ca 100644
(file)
--- a/
src/mesa/swrast/s_blend.c
+++ b/
src/mesa/swrast/s_blend.c
@@
-1,4
+1,4
@@
-/* $Id: s_blend.c,v 1.2
5 2002/10/17 15:26:39
brianp Exp $ */
+/* $Id: s_blend.c,v 1.2
6 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-774,7
+774,7
@@
void _swrast_choose_blend_func( GLcontext *ctx )
* pixel coordinates.
*/
void
* pixel coordinates.
*/
void
-_
mesa
_blend_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_blend_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-791,14
+791,14
@@
_mesa_blend_span( GLcontext *ctx, const struct sw_span *span,
span->array->x, span->array->y,
framebuffer, span->array->mask );
if (swrast->_RasterMask & ALPHABUF_BIT) {
span->array->x, span->array->y,
framebuffer, span->array->mask );
if (swrast->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_read_alpha_pixels( ctx, span->end,
+ _
swrast
_read_alpha_pixels( ctx, span->end,
span->array->x, span->array->y,
framebuffer, span->array->mask );
}
}
else {
/* horizontal run of pixels */
span->array->x, span->array->y,
framebuffer, span->array->mask );
}
}
else {
/* horizontal run of pixels */
- _
mesa
_read_rgba_span( ctx, ctx->DrawBuffer, span->end,
+ _
swrast
_read_rgba_span( ctx, ctx->DrawBuffer, span->end,
span->x, span->y, framebuffer );
}
span->x, span->y, framebuffer );
}
diff --git
a/src/mesa/swrast/s_blend.h
b/src/mesa/swrast/s_blend.h
index 8d3124f28c879a264f9dbc369438f0b530541456..5afa604783e9e3b42a724b81590eca27c3d9c045 100644
(file)
--- a/
src/mesa/swrast/s_blend.h
+++ b/
src/mesa/swrast/s_blend.h
@@
-1,4
+1,4
@@
-/* $Id: s_blend.h,v 1.
7 2003/02/23 04:10:54
brianp Exp $ */
+/* $Id: s_blend.h,v 1.
8 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-35,7
+35,7
@@
extern void
extern void
-_
mesa
_blend_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_blend_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] );
GLchan rgba[][4] );
diff --git
a/src/mesa/swrast/s_buffers.c
b/src/mesa/swrast/s_buffers.c
index cdb665fc18e4d812202b2b98240203cac0bf2eb8..1ee8030cd9d2783488998383ed3d0cebd066afc2 100644
(file)
--- a/
src/mesa/swrast/s_buffers.c
+++ b/
src/mesa/swrast/s_buffers.c
@@
-1,4
+1,4
@@
-/* $Id: s_buffers.c,v 1.1
6 2002/11/13 16:46:19
brianp Exp $ */
+/* $Id: s_buffers.c,v 1.1
7 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-66,7
+66,7
@@
clear_color_buffer_with_masking( GLcontext *ctx )
for (j = 0; j < width; j++) {
COPY_CHAN4(rgba[j], clearColor);
}
for (j = 0; j < width; j++) {
COPY_CHAN4(rgba[j], clearColor);
}
- _
mesa
_mask_rgba_array( ctx, width, x, y + i, rgba );
+ _
swrast
_mask_rgba_array( ctx, width, x, y + i, rgba );
(*swrast->Driver.WriteRGBASpan)( ctx, width, x, y + i,
(CONST GLchan (*)[4]) rgba, NULL );
}
(*swrast->Driver.WriteRGBASpan)( ctx, width, x, y + i,
(CONST GLchan (*)[4]) rgba, NULL );
}
@@
-81,7
+81,7
@@
clear_color_buffer_with_masking( GLcontext *ctx )
for (j=0;j<width;j++) {
span[j] = ctx->Color.ClearIndex;
}
for (j=0;j<width;j++) {
span[j] = ctx->Color.ClearIndex;
}
- _
mesa
_mask_index_array( ctx, width, x, y + i, span );
+ _
swrast
_mask_index_array( ctx, width, x, y + i, span );
(*swrast->Driver.WriteCI32Span)( ctx, width, x, y + i, span, mask );
}
}
(*swrast->Driver.WriteCI32Span)( ctx, width, x, y + i, span, mask );
}
}
@@
-190,16
+190,16
@@
_swrast_Clear( GLcontext *ctx, GLbitfield mask,
/* do software clearing here */
if (mask) {
if (mask & ctx->Color._DrawDestMask) clear_color_buffers(ctx);
/* do software clearing here */
if (mask) {
if (mask & ctx->Color._DrawDestMask) clear_color_buffers(ctx);
- if (mask & GL_DEPTH_BUFFER_BIT) _
mesa
_clear_depth_buffer(ctx);
- if (mask & GL_ACCUM_BUFFER_BIT) _
mesa
_clear_accum_buffer(ctx);
- if (mask & GL_STENCIL_BUFFER_BIT) _
mesa
_clear_stencil_buffer(ctx);
+ if (mask & GL_DEPTH_BUFFER_BIT) _
swrast
_clear_depth_buffer(ctx);
+ if (mask & GL_ACCUM_BUFFER_BIT) _
swarst
_clear_accum_buffer(ctx);
+ if (mask & GL_STENCIL_BUFFER_BIT) _
swrast
_clear_stencil_buffer(ctx);
}
/* clear software-based alpha buffer(s) */
if ( (mask & GL_COLOR_BUFFER_BIT)
&& ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
}
/* clear software-based alpha buffer(s) */
if ( (mask & GL_COLOR_BUFFER_BIT)
&& ctx->DrawBuffer->UseSoftwareAlphaBuffers
&& ctx->Color.ColorMask[ACOMP]) {
- _
mesa
_clear_alpha_buffers( ctx );
+ _
swrast
_clear_alpha_buffers( ctx );
}
RENDER_FINISH(swrast,ctx);
}
RENDER_FINISH(swrast,ctx);
@@
-211,16
+211,16
@@
_swrast_alloc_buffers( GLframebuffer *buffer )
{
/* Reallocate other buffers if needed. */
if (buffer->UseSoftwareDepthBuffer) {
{
/* Reallocate other buffers if needed. */
if (buffer->UseSoftwareDepthBuffer) {
- _
mesa
_alloc_depth_buffer( buffer );
+ _
swrast
_alloc_depth_buffer( buffer );
}
if (buffer->UseSoftwareStencilBuffer) {
}
if (buffer->UseSoftwareStencilBuffer) {
- _
mesa
_alloc_stencil_buffer( buffer );
+ _
swrast
_alloc_stencil_buffer( buffer );
}
if (buffer->UseSoftwareAccumBuffer) {
}
if (buffer->UseSoftwareAccumBuffer) {
- _
mesa
_alloc_accum_buffer( buffer );
+ _
swrast
_alloc_accum_buffer( buffer );
}
if (buffer->UseSoftwareAlphaBuffers) {
}
if (buffer->UseSoftwareAlphaBuffers) {
- _
mesa
_alloc_alpha_buffers( buffer );
+ _
swrast
_alloc_alpha_buffers( buffer );
}
}
}
}
diff --git
a/src/mesa/swrast/s_context.c
b/src/mesa/swrast/s_context.c
index 29b73df36571f14ea61615c888dd919f7d0a66ef..e36da3903026b35d715de1df916c5e232a0b907c 100644
(file)
--- a/
src/mesa/swrast/s_context.c
+++ b/
src/mesa/swrast/s_context.c
@@
-1,4
+1,4
@@
-/* $Id: s_context.c,v 1.4
7 2003/03/15 17:33:27
brianp Exp $ */
+/* $Id: s_context.c,v 1.4
8 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-601,12
+601,12
@@
_swrast_flush( GLcontext *ctx )
if (swrast->PointSpan.end > 0) {
if (ctx->Visual.rgbMode) {
if (ctx->Texture._EnabledUnits)
if (swrast->PointSpan.end > 0) {
if (ctx->Visual.rgbMode) {
if (ctx->Texture._EnabledUnits)
- _
mesa
_write_texture_span(ctx, &(swrast->PointSpan));
+ _
swrast
_write_texture_span(ctx, &(swrast->PointSpan));
else
else
- _
mesa
_write_rgba_span(ctx, &(swrast->PointSpan));
+ _
swrast
_write_rgba_span(ctx, &(swrast->PointSpan));
}
else {
}
else {
- _
mesa
_write_index_span(ctx, &(swrast->PointSpan));
+ _
swrast
_write_index_span(ctx, &(swrast->PointSpan));
}
swrast->PointSpan.end = 0;
}
}
swrast->PointSpan.end = 0;
}
diff --git
a/src/mesa/swrast/s_copypix.c
b/src/mesa/swrast/s_copypix.c
index 3a8d05b7f3db669c893e124879755ce796b7080d..b66cad2dad3217e4b4ae38a8f3bcbcd16fa8a33b 100644
(file)
--- a/
src/mesa/swrast/s_copypix.c
+++ b/
src/mesa/swrast/s_copypix.c
@@
-1,10
+1,10
@@
-/* $Id: s_copypix.c,v 1.4
3 2002/12/05 04:46:54
brianp Exp $ */
+/* $Id: s_copypix.c,v 1.4
4 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
* Version: 5.1
*
/*
* Mesa 3-D graphics library
* Version: 5.1
*
- * Copyright (C) 1999-200
2
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
3
Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-28,13
+28,13
@@
#include "glheader.h"
#include "context.h"
#include "convolve.h"
#include "glheader.h"
#include "context.h"
#include "convolve.h"
+#include "histogram.h"
#include "macros.h"
#include "imports.h"
#include "pixel.h"
#include "s_context.h"
#include "s_depth.h"
#include "macros.h"
#include "imports.h"
#include "pixel.h"
#include "s_context.h"
#include "s_depth.h"
-#include "s_histogram.h"
#include "s_pixeltex.h"
#include "s_span.h"
#include "s_stencil.h"
#include "s_pixeltex.h"
#include "s_span.h"
#include "s_stencil.h"
@@
-108,9
+108,9
@@
copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
if (ctx->Depth.Test)
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_RGBA);
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
@@
-153,7
+153,7
@@
copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
for (row = 0; row < height; row++) {
GLchan rgba[MAX_WIDTH][4];
GLint i;
for (row = 0; row < height; row++) {
GLchan rgba[MAX_WIDTH][4];
GLint i;
- _
mesa
_read_rgba_span(ctx, ctx->ReadBuffer, width, srcx, srcy + row, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->ReadBuffer, width, srcx, srcy + row, rgba);
/* convert GLchan to GLfloat */
for (i = 0; i < width; i++) {
*dest++ = (GLfloat) rgba[i][RCOMP] * (1.0F / CHAN_MAXF);
/* convert GLchan to GLfloat */
for (i = 0; i < width; i++) {
*dest++ = (GLfloat) rgba[i][RCOMP] * (1.0F / CHAN_MAXF);
@@
-258,7
+258,7
@@
copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.x = destx;
span.y = dy;
span.end = width;
span.x = destx;
span.y = dy;
span.end = width;
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4])span.array->rgba,
desty, 0);
}
(CONST GLchan (*)[4])span.array->rgba,
desty, 0);
}
@@
-266,7
+266,7
@@
copy_conv_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.x = destx;
span.y = dy;
span.end = width;
span.x = destx;
span.y = dy;
span.end = width;
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
}
}
}
@@
-316,9
+316,9
@@
copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
if (ctx->Depth.Test)
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
&& !zoom
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0
&& !zoom
@@
-347,7
+347,7
@@
copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
/* read the source image */
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
/* read the source image */
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, ssy,
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, ssy,
(GLchan (*)[4]) p );
p += width * 4;
}
(GLchan (*)[4]) p );
p += width * 4;
}
@@
-376,7
+376,7
@@
copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
if (changeBuffer)
_swrast_use_read_buffer(ctx);
ASSERT(width < MAX_WIDTH);
if (changeBuffer)
_swrast_use_read_buffer(ctx);
ASSERT(width < MAX_WIDTH);
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, sy,
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, srcx, sy,
span.array->rgba );
if (changeBuffer)
_swrast_use_draw_buffer(ctx);
span.array->rgba );
if (changeBuffer)
_swrast_use_draw_buffer(ctx);
@@
-476,7
+476,7
@@
copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.x = destx;
span.y = dy;
span.end = width;
span.x = destx;
span.y = dy;
span.end = width;
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba,
desty, 0);
}
(CONST GLchan (*)[4]) span.array->rgba,
desty, 0);
}
@@
-484,7
+484,7
@@
copy_rgba_pixels(GLcontext *ctx, GLint srcx, GLint srcy,
span.x = destx;
span.y = dy;
span.end = width;
span.x = destx;
span.y = dy;
span.end = width;
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
}
}
}
@@
-527,9
+527,9
@@
copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
if (ctx->Depth.Test)
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
/* If read and draw buffer are different we must do buffer switching */
changeBuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer
/* If read and draw buffer are different we must do buffer switching */
changeBuffer = ctx->Pixel.ReadBuffer != ctx->Color.DrawBuffer
@@
-548,7
+548,7
@@
copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
/* read the image */
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
/* read the image */
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
- _
mesa
_read_index_span( ctx, ctx->ReadBuffer, width, srcx, ssy, p );
+ _
swrast
_read_index_span( ctx, ctx->ReadBuffer, width, srcx, ssy, p );
p += width;
}
p = tmpImage;
p += width;
}
p = tmpImage;
@@
-572,7
+572,7
@@
copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
else {
if (changeBuffer)
_swrast_use_read_buffer(ctx);
else {
if (changeBuffer)
_swrast_use_read_buffer(ctx);
- _
mesa
_read_index_span( ctx, ctx->ReadBuffer, width, srcx, sy,
+ _
swrast
_read_index_span( ctx, ctx->ReadBuffer, width, srcx, sy,
span.array->index );
if (changeBuffer)
_swrast_use_draw_buffer(ctx);
span.array->index );
if (changeBuffer)
_swrast_use_draw_buffer(ctx);
@@
-591,9
+591,9
@@
copy_ci_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
span.y = dy;
span.end = width;
if (zoom)
span.y = dy;
span.end = width;
if (zoom)
- _
mesa
_write_zoomed_index_span(ctx, &span, desty, 0);
+ _
swrast
_write_zoomed_index_span(ctx, &span, desty, 0);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
}
if (overlapping)
}
if (overlapping)
@@
-641,9
+641,9
@@
copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
overlapping = regions_overlap(srcx, srcy, destx, desty, width, height,
ctx->Pixel.ZoomX, ctx->Pixel.ZoomY);
- _
mesa
_span_default_color(ctx, &span);
+ _
swrast
_span_default_color(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (overlapping) {
GLint ssy = sy;
if (overlapping) {
GLint ssy = sy;
@@
-654,7
+654,7
@@
copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
}
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
}
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
- _
mesa
_read_depth_span_float(ctx, width, srcx, ssy, p);
+ _
swrast
_read_depth_span_float(ctx, width, srcx, ssy, p);
p += width;
}
p = tmpImage;
p += width;
}
p = tmpImage;
@@
-673,7
+673,7
@@
copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
p += width;
}
else {
p += width;
}
else {
- _
mesa
_read_depth_span_float(ctx, width, srcx, sy, depth);
+ _
swrast
_read_depth_span_float(ctx, width, srcx, sy, depth);
}
/* apply scale and bias */
}
/* apply scale and bias */
@@
-688,16
+688,16
@@
copy_depth_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
span.end = width;
if (ctx->Visual.rgbMode) {
if (zoom)
span.end = width;
if (ctx->Visual.rgbMode) {
if (zoom)
- _
mesa
_write_zoomed_rgba_span( ctx, &span,
+ _
swrast
_write_zoomed_rgba_span( ctx, &span,
(const GLchan (*)[4])span.array->rgba, desty, 0 );
else
(const GLchan (*)[4])span.array->rgba, desty, 0 );
else
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
else {
if (zoom)
}
else {
if (zoom)
- _
mesa
_write_zoomed_index_span( ctx, &span, desty, 0 );
+ _
swrast
_write_zoomed_index_span( ctx, &span, desty, 0 );
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
}
}
}
}
@@
-750,7
+750,7
@@
copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
}
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
}
p = tmpImage;
for (j = 0; j < height; j++, ssy += stepy) {
- _
mesa
_read_stencil_span( ctx, width, srcx, ssy, p );
+ _
swrast
_read_stencil_span( ctx, width, srcx, ssy, p );
p += width;
}
p = tmpImage;
p += width;
}
p = tmpImage;
@@
-769,7
+769,7
@@
copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
p += width;
}
else {
p += width;
}
else {
- _
mesa
_read_stencil_span( ctx, width, srcx, sy, stencil );
+ _
swrast
_read_stencil_span( ctx, width, srcx, sy, stencil );
}
/* Apply shift, offset, look-up table */
}
/* Apply shift, offset, look-up table */
@@
-782,11
+782,11
@@
copy_stencil_pixels( GLcontext *ctx, GLint srcx, GLint srcy,
/* Write stencil values */
if (zoom) {
/* Write stencil values */
if (zoom) {
- _
mesa
_write_zoomed_stencil_span( ctx, width, destx, dy,
+ _
swrast
_write_zoomed_stencil_span( ctx, width, destx, dy,
stencil, desty, 0 );
}
else {
stencil, desty, 0 );
}
else {
- _
mesa
_write_stencil_span( ctx, width, destx, dy, stencil );
+ _
swrast
_write_stencil_span( ctx, width, destx, dy, stencil );
}
}
}
}
diff --git
a/src/mesa/swrast/s_depth.c
b/src/mesa/swrast/s_depth.c
index b15638b658a112577081644b4c9bbce476dae073..109585748de30025ed3b344d5ff685c184c921e2 100644
(file)
--- a/
src/mesa/swrast/s_depth.c
+++ b/
src/mesa/swrast/s_depth.c
@@
-1,4
+1,4
@@
-/* $Id: s_depth.c,v 1.2
5 2002/10/30 19:49:30
brianp Exp $ */
+/* $Id: s_depth.c,v 1.2
6 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-38,7
+38,7
@@
* Return address of depth buffer value for given window coord.
*/
GLvoid *
* Return address of depth buffer value for given window coord.
*/
GLvoid *
-_
mesa
_zbuffer_address(GLcontext *ctx, GLint x, GLint y)
+_
swrast
_zbuffer_address(GLcontext *ctx, GLint x, GLint y)
{
if (ctx->Visual.depthBits <= 16)
return (GLushort *) ctx->DrawBuffer->DepthBuffer
{
if (ctx->Visual.depthBits <= 16)
return (GLushort *) ctx->DrawBuffer->DepthBuffer
@@
-1355,7
+1355,7
@@
depth_test_pixels( GLcontext *ctx, struct sw_span *span )
* \return approx number of pixels that passed (only zero is reliable)
*/
GLuint
* \return approx number of pixels that passed (only zero is reliable)
*/
GLuint
-_
mesa
_depth_test_span( GLcontext *ctx, struct sw_span *span)
+_
swrast
_depth_test_span( GLcontext *ctx, struct sw_span *span)
{
if (span->arrayMask & SPAN_XY)
return depth_test_pixels(ctx, span);
{
if (span->arrayMask & SPAN_XY)
return depth_test_pixels(ctx, span);
@@
-1375,7
+1375,7
@@
_mesa_depth_test_span( GLcontext *ctx, struct sw_span *span)
* This function does clipping before calling the device driver function.
*/
void
* This function does clipping before calling the device driver function.
*/
void
-_
mesa
_read_depth_span( GLcontext *ctx,
+_
swrast
_read_depth_span( GLcontext *ctx,
GLint n, GLint x, GLint y, GLdepth depth[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint n, GLint x, GLint y, GLdepth depth[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1448,7
+1448,7
@@
_mesa_read_depth_span( GLcontext *ctx,
* Output: depth - the array of depth values
*/
void
* Output: depth - the array of depth values
*/
void
-_
mesa
_read_depth_span_float( GLcontext *ctx,
+_
swrast
_read_depth_span_float( GLcontext *ctx,
GLint n, GLint x, GLint y, GLfloat depth[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint n, GLint x, GLint y, GLfloat depth[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1529,7
+1529,7
@@
_mesa_read_depth_span_float( GLcontext *ctx,
* This function is only called through Driver.alloc_depth_buffer.
*/
void
* This function is only called through Driver.alloc_depth_buffer.
*/
void
-_
mesa
_alloc_depth_buffer( GLframebuffer *buffer )
+_
swrast
_alloc_depth_buffer( GLframebuffer *buffer )
{
GLint bytesPerValue;
{
GLint bytesPerValue;
@@
-1568,7
+1568,7
@@
_mesa_alloc_depth_buffer( GLframebuffer *buffer )
* This function is only called through Driver.clear_depth_buffer.
*/
void
* This function is only called through Driver.clear_depth_buffer.
*/
void
-_
mesa
_clear_depth_buffer( GLcontext *ctx )
+_
swrast
_clear_depth_buffer( GLcontext *ctx )
{
if (ctx->Visual.depthBits == 0
|| !ctx->DrawBuffer->DepthBuffer
{
if (ctx->Visual.depthBits == 0
|| !ctx->DrawBuffer->DepthBuffer
diff --git
a/src/mesa/swrast/s_depth.h
b/src/mesa/swrast/s_depth.h
index 674ee5e7b5aa71ebfb79c7f48ac19d6195692c63..9cc8e94524a6ac49ec339523b9f028a5935e29d3 100644
(file)
--- a/
src/mesa/swrast/s_depth.h
+++ b/
src/mesa/swrast/s_depth.h
@@
-1,4
+1,4
@@
-/* $Id: s_depth.h,v 1.
7 2003/02/23 04:10:54
brianp Exp $ */
+/* $Id: s_depth.h,v 1.
8 2003/03/25 02:23:45
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,31
+34,31
@@
extern GLvoid *
extern GLvoid *
-_
mesa
_zbuffer_address(GLcontext *ctx, GLint x, GLint y);
+_
swrast
_zbuffer_address(GLcontext *ctx, GLint x, GLint y);
extern GLuint
extern GLuint
-_
mesa
_depth_test_span( GLcontext *ctx, struct sw_span *span);
+_
swrast
_depth_test_span( GLcontext *ctx, struct sw_span *span);
extern void
extern void
-_
mesa
_read_depth_span( GLcontext *ctx,
+_
swrast
_read_depth_span( GLcontext *ctx,
GLint n, GLint x, GLint y, GLdepth depth[] );
extern void
GLint n, GLint x, GLint y, GLdepth depth[] );
extern void
-_
mesa
_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y,
+_
swrast
_read_depth_span_float( GLcontext *ctx, GLint n, GLint x, GLint y,
GLfloat depth[] );
extern void
GLfloat depth[] );
extern void
-_
mesa
_alloc_depth_buffer( GLframebuffer *buffer );
+_
swrast
_alloc_depth_buffer( GLframebuffer *buffer );
extern void
extern void
-_
mesa
_clear_depth_buffer( GLcontext *ctx );
+_
swrast
_clear_depth_buffer( GLcontext *ctx );
#endif
#endif
diff --git
a/src/mesa/swrast/s_drawpix.c
b/src/mesa/swrast/s_drawpix.c
index 10508166982b99b8669b9c18fb592a60934d76cd..bc791b90784252a398b2906ebd168d9fc481ce97 100644
(file)
--- a/
src/mesa/swrast/s_drawpix.c
+++ b/
src/mesa/swrast/s_drawpix.c
@@
-1,4
+1,4
@@
-/* $Id: s_drawpix.c,v 1.4
6 2003/03/01 01:50:2
5 brianp Exp $ */
+/* $Id: s_drawpix.c,v 1.4
7 2003/03/25 02:23:4
5 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-50,7
+50,7
@@
* GL_FALSE if image was completely clipped away (draw nothing)
*/
GLboolean
* GL_FALSE if image was completely clipped away (draw nothing)
*/
GLboolean
-_
mesa
_clip_pixelrect(const GLcontext *ctx,
+_
swrast
_clip_pixelrect(const GLcontext *ctx,
GLint *destX, GLint *destY,
GLsizei *width, GLsizei *height,
GLint *skipPixels, GLint *skipRows)
GLint *destX, GLint *destY,
GLsizei *width, GLsizei *height,
GLint *skipPixels, GLint *skipRows)
@@
-108,11
+108,11
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
}
if (ctx->Depth.Test)
}
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (ctx->Texture._EnabledUnits)
if (ctx->Texture._EnabledUnits)
- _
mesa
_span_default_texcoords(ctx, &span);
+ _
swrast
_span_default_texcoords(ctx, &span);
if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
&& ctx->Texture._EnabledUnits == 0
if ((SWRAST_CONTEXT(ctx)->_RasterMask & ~CLIP_BIT) == 0
&& ctx->Texture._EnabledUnits == 0
@@
-136,7
+136,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
rowLength = width;
/* If we're not using pixel zoom then do all clipping calculations
rowLength = width;
/* If we're not using pixel zoom then do all clipping calculations
- * now. Otherwise, we'll let the _
mesa
_write_zoomed_*_span() functions
+ * now. Otherwise, we'll let the _
swrast
_write_zoomed_*_span() functions
* handle the clipping.
*/
if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
* handle the clipping.
*/
if (ctx->Pixel.ZoomX==1.0F && ctx->Pixel.ZoomY==1.0F) {
@@
-240,7
+240,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) src, zoomY0, 0);
src += rowLength * 4;
destY++;
(CONST GLchan (*)[4]) src, zoomY0, 0);
src += rowLength * 4;
destY++;
@@
-280,7
+280,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _
mesa
_write_zoomed_rgb_span(ctx, &span,
+ _
swrast
_write_zoomed_rgb_span(ctx, &span,
(CONST GLchan (*)[3]) src, zoomY0, 0);
src += rowLength * 3;
destY++;
(CONST GLchan (*)[3]) src, zoomY0, 0);
src += rowLength * 3;
destY++;
@@
-342,7
+342,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _
mesa
_write_zoomed_rgb_span(ctx, &span,
+ _
swrast
_write_zoomed_rgb_span(ctx, &span,
(CONST GLchan (*)[3]) span.array->rgb, zoomY0, 0);
src += rowLength;
destY++;
(CONST GLchan (*)[3]) span.array->rgb, zoomY0, 0);
src += rowLength;
destY++;
@@
-410,7
+410,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength*2;
destY++;
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength*2;
destY++;
@@
-458,7
+458,7
@@
fast_draw_pixels(GLcontext *ctx, GLint x, GLint y,
span.x = destX;
span.y = destY;
span.end = drawWidth;
span.x = destX;
span.y = destY;
span.end = drawWidth;
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength;
destY++;
(CONST GLchan (*)[4]) span.array->rgba, zoomY0, 0);
src += rowLength;
destY++;
@@
-512,9
+512,9
@@
draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
if (ctx->Depth.Test)
INIT_SPAN(span, GL_BITMAP, 0, 0, SPAN_INDEX);
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
/*
* General solution
/*
* General solution
@@
-541,9
+541,9
@@
draw_index_pixels( GLcontext *ctx, GLint x, GLint y,
span.end = spanEnd;
if (zoom)
span.end = spanEnd;
if (zoom)
- _
mesa
_write_zoomed_index_span(ctx, &span, y, skipPixels);
+ _
swrast
_write_zoomed_index_span(ctx, &span, y, skipPixels);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
}
skipPixels += spanEnd;
}
}
skipPixels += spanEnd;
}
@@
-607,11
+607,11
@@
draw_stencil_pixels( GLcontext *ctx, GLint x, GLint y,
}
if (zoom) {
}
if (zoom) {
- _
mesa
_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
+ _
swrast
_write_zoomed_stencil_span(ctx, (GLuint) spanWidth,
spanX, spanY, values, desty, 0);
}
else {
spanX, spanY, values, desty, 0);
}
else {
- _
mesa
_write_stencil_span(ctx, (GLuint) spanWidth,
+ _
swrast
_write_stencil_span(ctx, (GLuint) spanWidth,
spanX, spanY, values);
}
}
spanX, spanY, values);
}
}
@@
-646,12
+646,12
@@
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
return;
}
return;
}
- _
mesa
_span_default_color(ctx, &span);
+ _
swrast
_span_default_color(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (ctx->Texture._EnabledUnits)
if (ctx->Texture._EnabledUnits)
- _
mesa
_span_default_texcoords(ctx, &span);
+ _
swrast
_span_default_texcoords(ctx, &span);
if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
&& !bias_or_scale && !zoom && ctx->Visual.rgbMode
if (type == GL_UNSIGNED_SHORT && ctx->Visual.depthBits == 16
&& !bias_or_scale && !zoom && ctx->Visual.rgbMode
@@
-668,7
+668,7
@@
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
GLint i;
for (i = 0; i < width; i++)
span.array->z[i] = zptr[i];
GLint i;
for (i = 0; i < width; i++)
span.array->z[i] = zptr[i];
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
}
else if (type == GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
}
}
else if (type == GL_UNSIGNED_INT && ctx->Visual.depthBits == 32
@@
-684,7
+684,7
@@
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
_mesa_image_address(&ctx->Unpack, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, row, 0);
MEMCPY(span.array->z, zptr, width * sizeof(GLdepth));
_mesa_image_address(&ctx->Unpack, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, row, 0);
MEMCPY(span.array->z, zptr, width * sizeof(GLdepth));
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
}
else {
}
}
else {
@@
-705,7
+705,7
@@
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
GL_DEPTH_COMPONENT, type,
0, row, skipPixels);
GL_DEPTH_COMPONENT, type,
0, row, skipPixels);
- /* Set these for each row since the _
mesa
_write_* function may
+ /* Set these for each row since the _
swrast
_write_* function may
* change them while clipping.
*/
span.x = spanX;
* change them while clipping.
*/
span.x = spanX;
@@
-724,18
+724,18
@@
draw_depth_pixels( GLcontext *ctx, GLint x, GLint y,
}
if (ctx->Visual.rgbMode) {
if (zoom) {
}
if (ctx->Visual.rgbMode) {
if (zoom) {
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(const GLchan (*)[4]) span.array->rgba,
desty, skipPixels);
}
else
(const GLchan (*)[4]) span.array->rgba,
desty, skipPixels);
}
else
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
else {
if (zoom)
}
else {
if (zoom)
- _
mesa
_write_zoomed_index_span(ctx, &span, desty, 0);
+ _
swrast
_write_zoomed_index_span(ctx, &span, desty, 0);
else
else
- _
mesa
_write_index_span(ctx, &span);
+ _
swrast
_write_index_span(ctx, &span);
}
}
skipPixels += spanEnd;
}
}
skipPixels += spanEnd;
@@
-774,11
+774,11
@@
draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
return;
if (ctx->Depth.Test)
return;
if (ctx->Depth.Test)
- _
mesa
_span_default_z(ctx, &span);
+ _
swrast
_span_default_z(ctx, &span);
if (ctx->Fog.Enabled)
if (ctx->Fog.Enabled)
- _
mesa
_span_default_fog(ctx, &span);
+ _
swrast
_span_default_fog(ctx, &span);
if (ctx->Texture._EnabledUnits)
if (ctx->Texture._EnabledUnits)
- _
mesa
_span_default_texcoords(ctx, &span);
+ _
swrast
_span_default_texcoords(ctx, &span);
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0
&& x + width <= (GLint) ctx->DrawBuffer->Width
if (SWRAST_CONTEXT(ctx)->_RasterMask == 0 && !zoom && x >= 0 && y >= 0
&& x + width <= (GLint) ctx->DrawBuffer->Width
@@
-861,7
+861,7
@@
draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
const GLvoid *source = _mesa_image_address(unpack,
pixels, width, height, format, type, 0, row, skipPixels);
const GLvoid *source = _mesa_image_address(unpack,
pixels, width, height, format, type, 0, row, skipPixels);
- /* Set these for each row since the _
mesa
_write_* function may
+ /* Set these for each row since the _
swrast
_write_* function may
* change them while clipping.
*/
span.x = spanX;
* change them while clipping.
*/
span.x = spanX;
@@
-889,11
+889,11
@@
draw_rgba_pixels( GLcontext *ctx, GLint x, GLint y,
(CONST GLchan (*)[4]) span.array->rgba, NULL);
}
else if (zoom) {
(CONST GLchan (*)[4]) span.array->rgba, NULL);
}
else if (zoom) {
- _
mesa
_write_zoomed_rgba_span(ctx, &span,
+ _
swrast
_write_zoomed_rgba_span(ctx, &span,
(CONST GLchan (*)[4]) span.array->rgba, desty, skipPixels);
}
else {
(CONST GLchan (*)[4]) span.array->rgba, desty, skipPixels);
}
else {
- _
mesa
_write_rgba_span(ctx, &span);
+ _
swrast
_write_rgba_span(ctx, &span);
}
}
}
}
diff --git
a/src/mesa/swrast/s_drawpix.h
b/src/mesa/swrast/s_drawpix.h
index a792ef8dd44844982308aadeab79c9ac06ffb803..9c0d8e5529f6fec88f8882cfd29c6d82e08e7b6f 100644
(file)
--- a/
src/mesa/swrast/s_drawpix.h
+++ b/
src/mesa/swrast/s_drawpix.h
@@
-1,4
+1,4
@@
-/* $Id: s_drawpix.h,v 1.
3 2001/03/12 00:48:42 gareth
Exp $ */
+/* $Id: s_drawpix.h,v 1.
4 2003/03/25 02:23:46 brianp
Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,7
+34,7
@@
extern GLboolean
extern GLboolean
-_
mesa
_clip_pixelrect(const GLcontext *ctx,
+_
swrast
_clip_pixelrect(const GLcontext *ctx,
GLint *destX, GLint *destY,
GLsizei *width, GLsizei *height,
GLint *skipPixels, GLint *skipRows);
GLint *destX, GLint *destY,
GLsizei *width, GLsizei *height,
GLint *skipPixels, GLint *skipRows);
diff --git
a/src/mesa/swrast/s_feedback.c
b/src/mesa/swrast/s_feedback.c
index 614820cc4c74f23eb417c0f82ae3b1bd361b21f0..f0264ac7741a8f32775eb2beb428376c0dc57b84 100644
(file)
--- a/
src/mesa/swrast/s_feedback.c
+++ b/
src/mesa/swrast/s_feedback.c
@@
-1,4
+1,4
@@
-/* $Id: s_feedback.c,v 1.1
0 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_feedback.c,v 1.1
1 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-85,12
+85,12
@@
static void feedback_vertex( GLcontext *ctx,
/*
* Put triangle in feedback buffer.
*/
/*
* Put triangle in feedback buffer.
*/
-void _
mesa
_feedback_triangle( GLcontext *ctx,
+void _
swrast
_feedback_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2)
{
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2)
{
- if (_
mesa_cull_
triangle( ctx, v0, v1, v2 )) {
+ if (_
swrast_cull
triangle( ctx, v0, v1, v2 )) {
FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN );
FEEDBACK_TOKEN( ctx, (GLfloat) 3 ); /* three vertices */
FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POLYGON_TOKEN );
FEEDBACK_TOKEN( ctx, (GLfloat) 3 ); /* three vertices */
@@
-107,7
+107,7
@@
void _mesa_feedback_triangle( GLcontext *ctx,
}
}
-void _
mesa
_feedback_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+void _
swrast
_feedback_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
{
GLenum token = GL_LINE_TOKEN;
SWcontext *swrast = SWRAST_CONTEXT(ctx);
{
GLenum token = GL_LINE_TOKEN;
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-129,19
+129,19
@@
void _mesa_feedback_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1
}
}
-void _
mesa
_feedback_point( GLcontext *ctx, const SWvertex *v )
+void _
swrast
_feedback_point( GLcontext *ctx, const SWvertex *v )
{
FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POINT_TOKEN );
feedback_vertex( ctx, v, v );
}
{
FEEDBACK_TOKEN( ctx, (GLfloat) (GLint) GL_POINT_TOKEN );
feedback_vertex( ctx, v, v );
}
-void _
mesa
_select_triangle( GLcontext *ctx,
+void _
swrast
_select_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2)
{
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2)
{
- if (_
mesa_cull_
triangle( ctx, v0, v1, v2 )) {
+ if (_
swrast_cull
triangle( ctx, v0, v1, v2 )) {
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v0->win[2] * zs );
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v0->win[2] * zs );
@@
-151,7
+151,7
@@
void _mesa_select_triangle( GLcontext *ctx,
}
}
-void _
mesa
_select_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
+void _
swrast
_select_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
{
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v0->win[2] * zs );
{
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v0->win[2] * zs );
@@
-159,7
+159,7
@@
void _mesa_select_line( GLcontext *ctx, const SWvertex *v0, const SWvertex *v1 )
}
}
-void _
mesa
_select_point( GLcontext *ctx, const SWvertex *v )
+void _
swrast
_select_point( GLcontext *ctx, const SWvertex *v )
{
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v->win[2] * zs );
{
const GLfloat zs = 1.0F / ctx->DepthMaxF;
_mesa_update_hitflag( ctx, v->win[2] * zs );
diff --git
a/src/mesa/swrast/s_feedback.h
b/src/mesa/swrast/s_feedback.h
index 9acae42db6379fe8f1dcd60b663f1de3f6c322bc..5b86a94bf89216f59a685cea031f73c3fdcdc725 100644
(file)
--- a/
src/mesa/swrast/s_feedback.h
+++ b/
src/mesa/swrast/s_feedback.h
@@
-1,4
+1,4
@@
-/* $Id: s_feedback.h,v 1.
5 2001/03/12 00:48:42 gareth
Exp $ */
+/* $Id: s_feedback.h,v 1.
6 2003/03/25 02:23:46 brianp
Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-33,20
+33,20
@@
#include "swrast.h"
#include "swrast.h"
-extern void _
mesa
_feedback_point( GLcontext *ctx, const SWvertex *v );
+extern void _
swrast
_feedback_point( GLcontext *ctx, const SWvertex *v );
-extern void _
mesa
_feedback_line( GLcontext *ctx,
+extern void _
swrast
_feedback_line( GLcontext *ctx,
const SWvertex *v1, const SWvertex *v2 );
const SWvertex *v1, const SWvertex *v2 );
-extern void _
mesa
_feedback_triangle( GLcontext *ctx, const SWvertex *v0,
+extern void _
swrast
_feedback_triangle( GLcontext *ctx, const SWvertex *v0,
const SWvertex *v1, const SWvertex *v2 );
const SWvertex *v1, const SWvertex *v2 );
-extern void _
mesa
_select_point( GLcontext *ctx, const SWvertex *v );
+extern void _
swrast
_select_point( GLcontext *ctx, const SWvertex *v );
-extern void _
mesa
_select_line( GLcontext *ctx,
+extern void _
swrast
_select_line( GLcontext *ctx,
const SWvertex *v1, const SWvertex *v2 );
const SWvertex *v1, const SWvertex *v2 );
-extern void _
mesa
_select_triangle( GLcontext *ctx, const SWvertex *v0,
+extern void _
swrast
_select_triangle( GLcontext *ctx, const SWvertex *v0,
const SWvertex *v1, const SWvertex *v2 );
#endif
const SWvertex *v1, const SWvertex *v2 );
#endif
diff --git
a/src/mesa/swrast/s_fog.c
b/src/mesa/swrast/s_fog.c
index 7a97193e1e507fc37b25faedea6fe29a868595c9..0b3ae5b060e7d08249764d2c7a5104f338744b1b 100644
(file)
--- a/
src/mesa/swrast/s_fog.c
+++ b/
src/mesa/swrast/s_fog.c
@@
-1,4
+1,4
@@
-/* $Id: s_fog.c,v 1.2
4 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_fog.c,v 1.2
5 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-41,7
+41,7
@@
* Used to convert current raster distance to a fog factor in [0,1].
*/
GLfloat
* Used to convert current raster distance to a fog factor in [0,1].
*/
GLfloat
-_
mesa
_z_to_fogfactor(GLcontext *ctx, GLfloat z)
+_
swrast
_z_to_fogfactor(GLcontext *ctx, GLfloat z)
{
GLfloat d, f;
{
GLfloat d, f;
@@
-62,7
+62,7
@@
_mesa_z_to_fogfactor(GLcontext *ctx, GLfloat z)
f = (GLfloat) exp(-(d * d * z * z));
return f;
default:
f = (GLfloat) exp(-(d * d * z * z));
return f;
default:
- _mesa_problem(ctx, "Bad fog mode in _
mesa
_z_to_fogfactor");
+ _mesa_problem(ctx, "Bad fog mode in _
swrast
_z_to_fogfactor");
return 0.0;
}
}
return 0.0;
}
}
@@
-222,7
+222,7
@@
compute_fog_factors_from_z( const GLcontext *ctx,
* fog factors per vertex.
*/
void
* fog factors per vertex.
*/
void
-_
mesa
_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
+_
swrast
_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint n = span->end;
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint n = span->end;
@@
-240,7
+240,7
@@
_mesa_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
if (swrast->_PreferPixelFog) {
/* compute fog factor from each fragment's Z value */
if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
if (swrast->_PreferPixelFog) {
/* compute fog factor from each fragment's Z value */
if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
- _
mesa
_span_interpolate_z(ctx, span);
+ _
swrast
_span_interpolate_z(ctx, span);
compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
span->arrayMask |= SPAN_FOG;
}
compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
span->arrayMask |= SPAN_FOG;
}
@@
-275,7
+275,7
@@
_mesa_fog_rgba_span( const GLcontext *ctx, struct sw_span *span )
* As above, but color index mode.
*/
void
* As above, but color index mode.
*/
void
-_
mesa
_fog_ci_span( const GLcontext *ctx, struct sw_span *span )
+_
swrast
_fog_ci_span( const GLcontext *ctx, struct sw_span *span )
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint n = span->end;
{
const SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint n = span->end;
@@
-288,7
+288,7
@@
_mesa_fog_ci_span( const GLcontext *ctx, struct sw_span *span )
if (swrast->_PreferPixelFog) {
/* compute fog factor from each fragment's Z value */
if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
if (swrast->_PreferPixelFog) {
/* compute fog factor from each fragment's Z value */
if ((span->interpMask & SPAN_Z) && (span->arrayMask & SPAN_Z) == 0)
- _
mesa
_span_interpolate_z(ctx, span);
+ _
swrast
_span_interpolate_z(ctx, span);
compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
span->arrayMask |= SPAN_FOG;
}
compute_fog_factors_from_z(ctx, n, span->array->z, span->array->fog);
span->arrayMask |= SPAN_FOG;
}
diff --git
a/src/mesa/swrast/s_fog.h
b/src/mesa/swrast/s_fog.h
index c7b234aee6eb4e2115361b21186f1ccb0116b294..acc522d27fdf6e56113492fedec7a027ae082b14 100644
(file)
--- a/
src/mesa/swrast/s_fog.h
+++ b/
src/mesa/swrast/s_fog.h
@@
-1,4
+1,4
@@
-/* $Id: s_fog.h,v 1.
9 2002/02/17 17:30:58
brianp Exp $ */
+/* $Id: s_fog.h,v 1.
10 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,13
+34,13
@@
extern GLfloat
extern GLfloat
-_
mesa
_z_to_fogfactor(GLcontext *ctx, GLfloat z);
+_
swrast
_z_to_fogfactor(GLcontext *ctx, GLfloat z);
extern void
extern void
-_
mesa
_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
+_
swrast
_fog_rgba_span( const GLcontext *ctx, struct sw_span *span );
extern void
extern void
-_
mesa
_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
+_
swrast
_fog_ci_span( const GLcontext *ctx, struct sw_span *span );
#endif
#endif
diff --git
a/src/mesa/swrast/s_imaging.c
b/src/mesa/swrast/s_imaging.c
index 98cbe347a7293ebe3bcb10c2d38e95ad04b263e7..1c432cc1b24f550cdaaefdc731490678fc12017f 100644
(file)
--- a/
src/mesa/swrast/s_imaging.c
+++ b/
src/mesa/swrast/s_imaging.c
@@
-1,4
+1,4
@@
-/* $Id: s_imaging.c,v 1.
6 2002/07/09 01:22:52
brianp Exp $ */
+/* $Id: s_imaging.c,v 1.
7 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-46,7
+46,7
@@
_swrast_CopyColorTable( GLcontext *ctx,
width = MAX_WIDTH;
/* read the data from framebuffer */
width = MAX_WIDTH;
/* read the data from framebuffer */
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
/* Restore reading from draw buffer (the default) */
_swrast_use_draw_buffer(ctx);
/* Restore reading from draw buffer (the default) */
_swrast_use_draw_buffer(ctx);
@@
-67,7
+67,7
@@
_swrast_CopyColorSubTable( GLcontext *ctx,GLenum target, GLsizei start,
width = MAX_WIDTH;
/* read the data from framebuffer */
width = MAX_WIDTH;
/* read the data from framebuffer */
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y, data );
/* Restore reading from draw buffer (the default) */
_swrast_use_draw_buffer(ctx);
/* Restore reading from draw buffer (the default) */
_swrast_use_draw_buffer(ctx);
@@
-90,7
+90,7
@@
_swrast_CopyConvolutionFilter1D(GLcontext *ctx, GLenum target,
RENDER_START( swrast, ctx );
/* read the data from framebuffer */
RENDER_START( swrast, ctx );
/* read the data from framebuffer */
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y,
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y,
(GLchan (*)[4]) rgba );
RENDER_FINISH( swrast, ctx );
(GLchan (*)[4]) rgba );
RENDER_FINISH( swrast, ctx );
@@
-121,7
+121,7
@@
_swrast_CopyConvolutionFilter2D(GLcontext *ctx, GLenum target,
/* read pixels from framebuffer */
for (i = 0; i < height; i++) {
/* read pixels from framebuffer */
for (i = 0; i < height; i++) {
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
(GLchan (*)[4]) rgba[i] );
}
(GLchan (*)[4]) rgba[i] );
}
diff --git
a/src/mesa/swrast/s_lines.c
b/src/mesa/swrast/s_lines.c
index b21b39d61f7fc0f285a98eb9adee2610a25cc251..c3c5c582f1535fc8534d983f8b7eaac2b3e69437 100644
(file)
--- a/
src/mesa/swrast/s_lines.c
+++ b/
src/mesa/swrast/s_lines.c
@@
-1,4
+1,4
@@
-/* $Id: s_lines.c,v 1.3
5 2003/03/01 01:50:25
brianp Exp $ */
+/* $Id: s_lines.c,v 1.3
6 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-89,11
+89,11
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
y[i]++;
}
if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
y[i]++;
}
if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
- _
mesa
_write_texture_span(ctx, span);
+ _
swrast
_write_texture_span(ctx, span);
else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
else
else
- _
mesa
_write_index_span(ctx, span);
+ _
swrast
_write_index_span(ctx, span);
}
}
else {
}
}
else {
@@
-110,11
+110,11
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
x[i]++;
}
if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
x[i]++;
}
if ((span->interpMask | span->arrayMask) & SPAN_TEXTURE)
- _
mesa
_write_texture_span(ctx, span);
+ _
swrast
_write_texture_span(ctx, span);
else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
else if ((span->interpMask | span->arrayMask) & SPAN_RGBA)
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
else
else
- _
mesa
_write_index_span(ctx, span);
+ _
swrast
_write_index_span(ctx, span);
}
}
}
}
}
}
@@
-129,14
+129,14
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
/* Simple color index line (no stipple, width=1, no Z, no fog, no tex)*/
#define NAME simple_ci_line
#define INTERP_INDEX
/* Simple color index line (no stipple, width=1, no Z, no fog, no tex)*/
#define NAME simple_ci_line
#define INTERP_INDEX
-#define RENDER_SPAN(span) _
mesa
_write_index_span(ctx, &span)
+#define RENDER_SPAN(span) _
swrast
_write_index_span(ctx, &span)
#include "s_linetemp.h"
/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/
#define NAME simple_rgba_line
#define INTERP_RGBA
#include "s_linetemp.h"
/* Simple RGBA index line (no stipple, width=1, no Z, no fog, no tex)*/
#define NAME simple_rgba_line
#define INTERP_RGBA
-#define RENDER_SPAN(span) _
mesa
_write_rgba_span(ctx, &span);
+#define RENDER_SPAN(span) _
swrast
_write_rgba_span(ctx, &span);
#include "s_linetemp.h"
#include "s_linetemp.h"
@@
-154,7
+154,7
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
- _
mesa_write_index_span(ctx, &span);
\
+ _
swrast_write_index_span(ctx, &span);
\
}
#include "s_linetemp.h"
}
#include "s_linetemp.h"
@@
-173,7
+173,7
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
- _
mesa_write_rgba_span(ctx, &span);
\
+ _
swrast_write_rgba_span(ctx, &span);
\
}
#include "s_linetemp.h"
}
#include "s_linetemp.h"
@@
-193,7
+193,7
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
- _
mesa_write_texture_span(ctx, &span);
\
+ _
swrast_write_texture_span(ctx, &span);
\
}
#include "s_linetemp.h"
}
#include "s_linetemp.h"
@@
-214,7
+214,7
@@
draw_wide_line( GLcontext *ctx, struct sw_span *span, GLboolean xMajor )
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
draw_wide_line(ctx, &span, dx > dy); \
} \
else { \
- _
mesa_write_texture_span(ctx, &span);
\
+ _
swrast_write_texture_span(ctx, &span);
\
}
#include "s_linetemp.h"
}
#include "s_linetemp.h"
@@
-332,11
+332,11
@@
_swrast_choose_line( GLcontext *ctx )
}
}
else if (ctx->RenderMode == GL_FEEDBACK) {
}
}
else if (ctx->RenderMode == GL_FEEDBACK) {
- USE(_
mesa
_feedback_line);
+ USE(_
swrast
_feedback_line);
}
else {
ASSERT(ctx->RenderMode == GL_SELECT);
}
else {
ASSERT(ctx->RenderMode == GL_SELECT);
- USE(_
mesa
_select_line);
+ USE(_
swrast
_select_line);
}
/*_mesa_print_line_function(ctx);*/
}
/*_mesa_print_line_function(ctx);*/
diff --git
a/src/mesa/swrast/s_linetemp.h
b/src/mesa/swrast/s_linetemp.h
index 0bea948d355c3863a67b9d7a3307bf2ef0592202..34bff2fdb11b99292944c82d48c3ef045a5c9a4f 100644
(file)
--- a/
src/mesa/swrast/s_linetemp.h
+++ b/
src/mesa/swrast/s_linetemp.h
@@
-1,4
+1,4
@@
-/* $Id: s_linetemp.h,v 1.1
7 2003/02/25 19:26:01
brianp Exp $ */
+/* $Id: s_linetemp.h,v 1.1
8 2003/03/25 02:23:46
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-153,7
+153,7
@@
NAME( GLcontext *ctx, const SWvertex *vert0, const SWvertex *vert1 )
return;
#ifdef DEPTH_TYPE
return;
#ifdef DEPTH_TYPE
- zPtr = (DEPTH_TYPE *) _
mesa
_zbuffer_address(ctx, x0, y0);
+ zPtr = (DEPTH_TYPE *) _
swrast
_zbuffer_address(ctx, x0, y0);
#endif
#ifdef PIXEL_ADDRESS
pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
#endif
#ifdef PIXEL_ADDRESS
pixelPtr = (PIXEL_TYPE *) PIXEL_ADDRESS(x0,y0);
diff --git
a/src/mesa/swrast/s_logic.c
b/src/mesa/swrast/s_logic.c
index 277ace6fa6059ebd2db6f6ed9bbea33c88ddd339..c130387674bc0a7beffa4c9079f95ede6e5f9fe1 100644
(file)
--- a/
src/mesa/swrast/s_logic.c
+++ b/
src/mesa/swrast/s_logic.c
@@
-1,4
+1,4
@@
-/* $Id: s_logic.c,v 1.1
2 2002/10/24 23:57:24
brianp Exp $ */
+/* $Id: s_logic.c,v 1.1
3 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-166,7
+166,7
@@
index_logicop( GLcontext *ctx, GLuint n, GLuint index[], const GLuint dest[],
* used if the device driver can't do logic ops.
*/
void
* used if the device driver can't do logic ops.
*/
void
-_
mesa
_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
GLuint index[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint index[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-463,7
+463,7
@@
rgba_logicop_chan( const GLcontext *ctx, GLuint n, const GLubyte mask[],
* pixel coordinates.
*/
void
* pixel coordinates.
*/
void
-_
mesa
_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-477,13
+477,13
@@
_mesa_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
span->array->x, span->array->y,
dest, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
span->array->x, span->array->y,
dest, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_read_alpha_pixels(ctx, span->end,
+ _
swrast
_read_alpha_pixels(ctx, span->end,
span->array->x, span->array->y,
dest, span->array->mask);
}
}
else {
span->array->x, span->array->y,
dest, span->array->mask);
}
}
else {
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, span->end,
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, span->end,
span->x, span->y, dest);
}
span->x, span->y, dest);
}
diff --git
a/src/mesa/swrast/s_logic.h
b/src/mesa/swrast/s_logic.h
index 537b44a6b96e10ae6f9c54aea39809d9718e091c..824f2352f3fd298910fa9b527980d4a94252d764 100644
(file)
--- a/
src/mesa/swrast/s_logic.h
+++ b/
src/mesa/swrast/s_logic.h
@@
-1,4
+1,4
@@
-/* $Id: s_logic.h,v 1.
5 2002/02/02 21:40:33
brianp Exp $ */
+/* $Id: s_logic.h,v 1.
6 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,12
+34,12
@@
extern void
extern void
-_
mesa
_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_logicop_ci_span( GLcontext *ctx, const struct sw_span *span,
GLuint index[] );
extern void
GLuint index[] );
extern void
-_
mesa
_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_logicop_rgba_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] );
GLchan rgba[][4] );
diff --git
a/src/mesa/swrast/s_masking.c
b/src/mesa/swrast/s_masking.c
index 7e0adc42d3521813d0e40e50513a7f4fa805a235..2b761426df67513838a813599a8b6c9f2e662e35 100644
(file)
--- a/
src/mesa/swrast/s_masking.c
+++ b/
src/mesa/swrast/s_masking.c
@@
-1,4
+1,4
@@
-/* $Id: s_masking.c,v 1.
8 2002/08/07 00:45:0
7 brianp Exp $ */
+/* $Id: s_masking.c,v 1.
9 2003/03/25 02:23:4
7 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-42,7
+42,7
@@
void
void
-_
mesa
_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-68,12
+68,12
@@
_mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
(*swrast->Driver.ReadRGBAPixels)(ctx, n, span->array->x, span->array->y,
dest, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
(*swrast->Driver.ReadRGBAPixels)(ctx, n, span->array->x, span->array->y,
dest, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_read_alpha_pixels(ctx, n, span->array->x, span->array->y,
+ _
swrast
_read_alpha_pixels(ctx, n, span->array->x, span->array->y,
dest, span->array->mask);
}
}
else {
dest, span->array->mask);
}
}
else {
- _
mesa
_read_rgba_span(ctx, ctx->DrawBuffer, n, span->x, span->y, dest);
+ _
swrast
_read_rgba_span(ctx, ctx->DrawBuffer, n, span->x, span->y, dest);
}
#if CHAN_BITS == 8
}
#if CHAN_BITS == 8
@@
-97,7
+97,7
@@
_mesa_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
* Apply glColorMask to a span of RGBA pixels.
*/
void
* Apply glColorMask to a span of RGBA pixels.
*/
void
-_
mesa
_mask_rgba_array( GLcontext *ctx,
+_
swrast
_mask_rgba_array( GLcontext *ctx,
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
GLchan dest[MAX_WIDTH][4];
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
GLchan dest[MAX_WIDTH][4];
@@
-110,7
+110,7
@@
_mesa_mask_rgba_array( GLcontext *ctx,
GLuint *rgba32 = (GLuint *) rgba;
GLuint *dest32 = (GLuint *) dest;
GLuint *rgba32 = (GLuint *) rgba;
GLuint *dest32 = (GLuint *) dest;
- _
mesa
_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+ _
swrast
_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
for (i = 0; i < n; i++) {
rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
}
for (i = 0; i < n; i++) {
rgba32[i] = (rgba32[i] & srcMask) | (dest32[i] & dstMask);
}
@@
-122,7
+122,7
@@
_mesa_mask_rgba_array( GLcontext *ctx,
const GLint bMask = ctx->Color.ColorMask[BCOMP];
const GLint aMask = ctx->Color.ColorMask[ACOMP];
const GLint bMask = ctx->Color.ColorMask[BCOMP];
const GLint aMask = ctx->Color.ColorMask[ACOMP];
- _
mesa
_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
+ _
swrast
_read_rgba_span( ctx, ctx->DrawBuffer, n, x, y, dest );
for (i = 0; i < n; i++) {
if (!rMask) rgba[i][RCOMP] = dest[i][RCOMP];
if (!gMask) rgba[i][GCOMP] = dest[i][GCOMP];
for (i = 0; i < n; i++) {
if (!rMask) rgba[i][RCOMP] = dest[i][RCOMP];
if (!gMask) rgba[i][GCOMP] = dest[i][GCOMP];
@@
-136,7
+136,7
@@
_mesa_mask_rgba_array( GLcontext *ctx,
void
void
-_
mesa
_mask_index_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_mask_index_span( GLcontext *ctx, const struct sw_span *span,
GLuint index[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint index[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-159,7
+159,7
@@
_mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
}
}
else {
}
}
else {
- _
mesa
_read_index_span(ctx, ctx->DrawBuffer, span->end, span->x, span->y,
+ _
swrast
_read_index_span(ctx, ctx->DrawBuffer, span->end, span->x, span->y,
fbindexes );
for (i = 0; i < span->end; i++) {
fbindexes );
for (i = 0; i < span->end; i++) {
@@
-174,14
+174,14
@@
_mesa_mask_index_span( GLcontext *ctx, const struct sw_span *span,
* Apply glIndexMask to a span of CI pixels.
*/
void
* Apply glIndexMask to a span of CI pixels.
*/
void
-_
mesa
_mask_index_array( GLcontext *ctx,
+_
swrast
_mask_index_array( GLcontext *ctx,
GLuint n, GLint x, GLint y, GLuint index[] )
{
GLuint i;
GLuint fbindexes[MAX_WIDTH];
GLuint msrc, mdest;
GLuint n, GLint x, GLint y, GLuint index[] )
{
GLuint i;
GLuint fbindexes[MAX_WIDTH];
GLuint msrc, mdest;
- _
mesa
_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes );
+ _
swrast
_read_index_span( ctx, ctx->DrawBuffer, n, x, y, fbindexes );
msrc = ctx->Color.IndexMask;
mdest = ~msrc;
msrc = ctx->Color.IndexMask;
mdest = ~msrc;
diff --git
a/src/mesa/swrast/s_masking.h
b/src/mesa/swrast/s_masking.h
index df68d81cfb1e115c5b37f2103cf425451d079bf5..f9f61e950fb82ca153bfe30e49eb39d6c8132e75 100644
(file)
--- a/
src/mesa/swrast/s_masking.h
+++ b/
src/mesa/swrast/s_masking.h
@@
-1,4
+1,4
@@
-/* $Id: s_masking.h,v 1.
5 2002/02/02 21:40:33
brianp Exp $ */
+/* $Id: s_masking.h,v 1.
6 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-37,12
+37,12
@@
* Implement glColorMask for a span of RGBA pixels.
*/
extern void
* Implement glColorMask for a span of RGBA pixels.
*/
extern void
-_
mesa
_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_mask_rgba_span( GLcontext *ctx, const struct sw_span *span,
GLchan rgba[][4] );
extern void
GLchan rgba[][4] );
extern void
-_
mesa
_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_
swrast
_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
GLchan rgba[][4] );
GLchan rgba[][4] );
@@
-50,12
+50,12
@@
_mesa_mask_rgba_array( GLcontext *ctx, GLuint n, GLint x, GLint y,
* Implement glIndexMask for a span of CI pixels.
*/
extern void
* Implement glIndexMask for a span of CI pixels.
*/
extern void
-_
mesa
_mask_index_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_mask_index_span( GLcontext *ctx, const struct sw_span *span,
GLuint index[] );
extern void
GLuint index[] );
extern void
-_
mesa
_mask_index_array( GLcontext *ctx,
+_
swrast
_mask_index_array( GLcontext *ctx,
GLuint n, GLint x, GLint y, GLuint index[] );
GLuint n, GLint x, GLint y, GLuint index[] );
diff --git
a/src/mesa/swrast/s_nvfragprog.c
b/src/mesa/swrast/s_nvfragprog.c
index 80c628604b843ad35385a4eedeb08f06911ef76d..7d5180381a96f52743ed36a9000d91fca9a467c8 100644
(file)
--- a/
src/mesa/swrast/s_nvfragprog.c
+++ b/
src/mesa/swrast/s_nvfragprog.c
@@
-1,4
+1,4
@@
-/* $Id: s_nvfragprog.c,v 1.1
1 2003/03/19 07:15:35 joukj
Exp $ */
+/* $Id: s_nvfragprog.c,v 1.1
2 2003/03/25 02:23:47 brianp
Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-74,7
+74,7
@@
fetch_texel_deriv( GLcontext *ctx, const GLfloat texcoord[4],
const GLfloat texH = (GLfloat) texImg->HeightScale;
GLchan rgba[4];
const GLfloat texH = (GLfloat) texImg->HeightScale;
GLchan rgba[4];
- GLfloat lambda = _
mesa
_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
+ GLfloat lambda = _
swrast
_compute_lambda(texdx[0], texdy[0], /* ds/dx, ds/dy */
texdx[1], texdy[1], /* dt/dx, dt/dy */
texdx[3], texdy[2], /* dq/dx, dq/dy */
texW, texH,
texdx[1], texdy[1], /* dt/dx, dt/dy */
texdx[3], texdy[2], /* dq/dx, dq/dy */
texW, texH,
diff --git
a/src/mesa/swrast/s_points.c
b/src/mesa/swrast/s_points.c
index 2bbd169b747941403a88953385cd7537e417c975..640a70ac92b26b5c714b4d39221e3eb44486ece2 100644
(file)
--- a/
src/mesa/swrast/s_points.c
+++ b/
src/mesa/swrast/s_points.c
@@
-1,4
+1,4
@@
-/* $Id: s_points.c,v 1.2
0 2003/03/01 01:50:26
brianp Exp $ */
+/* $Id: s_points.c,v 1.2
1 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-268,10
+268,10
@@
_swrast_choose_point( GLcontext *ctx )
}
}
else if (ctx->RenderMode==GL_FEEDBACK) {
}
}
else if (ctx->RenderMode==GL_FEEDBACK) {
- USE(_
mesa
_feedback_point);
+ USE(_
swrast
_feedback_point);
}
else {
/* GL_SELECT mode */
}
else {
/* GL_SELECT mode */
- USE(_
mesa
_select_point);
+ USE(_
swrast
_select_point);
}
}
}
}
diff --git
a/src/mesa/swrast/s_pointtemp.h
b/src/mesa/swrast/s_pointtemp.h
index d4c86ab00e754732f38be2b8a8d0bc58b2a48f50..d0e2b54a03999b09249f9b2d99d6dd44668411be 100644
(file)
--- a/
src/mesa/swrast/s_pointtemp.h
+++ b/
src/mesa/swrast/s_pointtemp.h
@@
-1,4
+1,4
@@
-/* $Id: s_pointtemp.h,v 1.2
2 2003/01/14 04:55:46
brianp Exp $ */
+/* $Id: s_pointtemp.h,v 1.2
3 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-193,13
+193,13
@@
NAME ( GLcontext *ctx, const SWvertex *vert )
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
#if FLAGS & (TEXTURE | SPRITE)
if (ctx->Texture._EnabledUnits)
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
#if FLAGS & (TEXTURE | SPRITE)
if (ctx->Texture._EnabledUnits)
- _
mesa
_write_texture_span(ctx, span);
+ _
swrast
_write_texture_span(ctx, span);
else
else
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#elif FLAGS & RGBA
#elif FLAGS & RGBA
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#else
#else
- _
mesa
_write_index_span(ctx, span);
+ _
swrast
_write_index_span(ctx, span);
#endif
span->end = 0;
}
#endif
span->end = 0;
}
@@
-322,13
+322,13
@@
NAME ( GLcontext *ctx, const SWvertex *vert )
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
#if FLAGS & (TEXTURE | SPRITE)
if (ctx->Texture._EnabledUnits)
(swrast->_RasterMask & (BLEND_BIT | LOGIC_OP_BIT | MASKING_BIT))) {
#if FLAGS & (TEXTURE | SPRITE)
if (ctx->Texture._EnabledUnits)
- _
mesa
_write_texture_span(ctx, span);
+ _
swrast
_write_texture_span(ctx, span);
else
else
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#elif FLAGS & RGBA
#elif FLAGS & RGBA
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#else
#else
- _
mesa
_write_index_span(ctx, span);
+ _
swrast
_write_index_span(ctx, span);
#endif
span->end = 0;
}
#endif
span->end = 0;
}
diff --git
a/src/mesa/swrast/s_readpix.c
b/src/mesa/swrast/s_readpix.c
index 5375cb922d97cddbcf1481f5e395913974cf7703..11bb6265b6f33adee69c3dd315d76bcb27e9298f 100644
(file)
--- a/
src/mesa/swrast/s_readpix.c
+++ b/
src/mesa/swrast/s_readpix.c
@@
-1,4
+1,4
@@
-/* $Id: s_readpix.c,v 1.1
7 2002/10/24 23:57:24
brianp Exp $ */
+/* $Id: s_readpix.c,v 1.1
8 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-126,7
+126,7
@@
read_depth_pixels( GLcontext *ctx,
GLushort *dst = (GLushort*) _mesa_image_address( packing, pixels,
width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
GLint i;
GLushort *dst = (GLushort*) _mesa_image_address( packing, pixels,
width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
GLint i;
- _
mesa
_read_depth_span(ctx, width, x, y, depth);
+ _
swrast
_read_depth_span(ctx, width, x, y, depth);
for (i = 0; i < width; i++)
dst[i] = depth[i];
}
for (i = 0; i < width; i++)
dst[i] = depth[i];
}
@@
-138,7
+138,7
@@
read_depth_pixels( GLcontext *ctx,
for (j=0;j<height;j++,y++) {
GLdepth *dst = (GLdepth *) _mesa_image_address( packing, pixels,
width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
for (j=0;j<height;j++,y++) {
GLdepth *dst = (GLdepth *) _mesa_image_address( packing, pixels,
width, height, GL_DEPTH_COMPONENT, type, 0, j, 0 );
- _
mesa
_read_depth_span(ctx, width, x, y, dst);
+ _
swrast
_read_depth_span(ctx, width, x, y, dst);
}
}
else {
}
}
else {
@@
-148,7
+148,7
@@
read_depth_pixels( GLcontext *ctx,
GLfloat depth[MAX_WIDTH];
GLvoid *dest;
GLfloat depth[MAX_WIDTH];
GLvoid *dest;
- _
mesa
_read_depth_span_float(ctx, readWidth, x, y, depth);
+ _
swrast
_read_depth_span_float(ctx, readWidth, x, y, depth);
dest = _mesa_image_address(packing, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, j, 0);
dest = _mesa_image_address(packing, pixels, width, height,
GL_DEPTH_COMPONENT, type, 0, j, 0);
@@
-195,7
+195,7
@@
read_stencil_pixels( GLcontext *ctx,
GLvoid *dest;
GLstencil stencil[MAX_WIDTH];
GLvoid *dest;
GLstencil stencil[MAX_WIDTH];
- _
mesa
_read_stencil_span(ctx, readWidth, x, y, stencil);
+ _
swrast
_read_stencil_span(ctx, readWidth, x, y, stencil);
dest = _mesa_image_address(packing, pixels, width, height,
GL_STENCIL_INDEX, type, 0, j, 0);
dest = _mesa_image_address(packing, pixels, width, height,
GL_STENCIL_INDEX, type, 0, j, 0);
@@
-292,7
+292,7
@@
read_fast_rgba_pixels( GLcontext *ctx,
(*swrast->Driver.ReadRGBASpan)(ctx, readWidth, srcX, srcY,
(GLchan (*)[4]) dest);
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
(*swrast->Driver.ReadRGBASpan)(ctx, readWidth, srcX, srcY,
(GLchan (*)[4]) dest);
if (ctx->DrawBuffer->UseSoftwareAlphaBuffers) {
- _
mesa
_read_alpha_span(ctx, readWidth, srcX, srcY,
+ _
swrast
_read_alpha_span(ctx, readWidth, srcX, srcY,
(GLchan (*)[4]) dest);
}
dest += rowLength * 4;
(GLchan (*)[4]) dest);
}
dest += rowLength * 4;
@@
-390,7
+390,7
@@
read_rgba_pixels( GLcontext *ctx,
for (row = 0; row < height; row++, y++) {
GLchan rgba[MAX_WIDTH][4];
if (ctx->Visual.rgbMode) {
for (row = 0; row < height; row++, y++) {
GLchan rgba[MAX_WIDTH][4];
if (ctx->Visual.rgbMode) {
- _
mesa
_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
}
else {
GLuint index[MAX_WIDTH];
}
else {
GLuint index[MAX_WIDTH];
@@
-436,7
+436,7
@@
read_rgba_pixels( GLcontext *ctx,
GLchan rgba[MAX_WIDTH][4];
GLvoid *dst;
if (ctx->Visual.rgbMode) {
GLchan rgba[MAX_WIDTH][4];
GLvoid *dst;
if (ctx->Visual.rgbMode) {
- _
mesa
_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
+ _
swrast
_read_rgba_span(ctx, ctx->ReadBuffer, readWidth, x, y, rgba);
}
else {
GLuint index[MAX_WIDTH];
}
else {
GLuint index[MAX_WIDTH];
diff --git
a/src/mesa/swrast/s_span.c
b/src/mesa/swrast/s_span.c
index 842f3be3c201ed68a3985a6a69d9007584f920ec..d6959e1f4c9495de52ec089fe1bdabe181215c2c 100644
(file)
--- a/
src/mesa/swrast/s_span.c
+++ b/
src/mesa/swrast/s_span.c
@@
-1,4
+1,4
@@
-/* $Id: s_span.c,v 1.
59 2003/03/16 22:02:3
7 brianp Exp $ */
+/* $Id: s_span.c,v 1.
60 2003/03/25 02:23:4
7 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-57,7
+57,7
@@
* Used during setup for glDraw/CopyPixels.
*/
void
* Used during setup for glDraw/CopyPixels.
*/
void
-_
mesa
_span_default_z( GLcontext *ctx, struct sw_span *span )
+_
swrast
_span_default_z( GLcontext *ctx, struct sw_span *span )
{
if (ctx->Visual.depthBits <= 16)
span->z = FloatToFixed(ctx->Current.RasterPos[2] * ctx->DepthMax + 0.5F);
{
if (ctx->Visual.depthBits <= 16)
span->z = FloatToFixed(ctx->Current.RasterPos[2] * ctx->DepthMax + 0.5F);
@@
-73,9
+73,9
@@
_mesa_span_default_z( GLcontext *ctx, struct sw_span *span )
* Used during setup for glDraw/CopyPixels.
*/
void
* Used during setup for glDraw/CopyPixels.
*/
void
-_
mesa
_span_default_fog( GLcontext *ctx, struct sw_span *span )
+_
swrast
_span_default_fog( GLcontext *ctx, struct sw_span *span )
{
{
- span->fog = _
mesa
_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
+ span->fog = _
swrast
_z_to_fogfactor(ctx, ctx->Current.RasterDistance);
span->fogStep = span->dfogdx = span->dfogdy = 0.0F;
span->interpMask |= SPAN_FOG;
}
span->fogStep = span->dfogdx = span->dfogdy = 0.0F;
span->interpMask |= SPAN_FOG;
}
@@
-86,7
+86,7
@@
_mesa_span_default_fog( GLcontext *ctx, struct sw_span *span )
* Used during setup for glDraw/CopyPixels.
*/
void
* Used during setup for glDraw/CopyPixels.
*/
void
-_
mesa
_span_default_color( GLcontext *ctx, struct sw_span *span )
+_
swrast
_span_default_color( GLcontext *ctx, struct sw_span *span )
{
if (ctx->Visual.rgbMode) {
GLchan r, g, b, a;
{
if (ctx->Visual.rgbMode) {
GLchan r, g, b, a;
@@
-124,7
+124,7
@@
_mesa_span_default_color( GLcontext *ctx, struct sw_span *span )
* Used during setup for glDraw/CopyPixels.
*/
void
* Used during setup for glDraw/CopyPixels.
*/
void
-_
mesa
_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
+_
swrast
_span_default_texcoords( GLcontext *ctx, struct sw_span *span )
{
GLuint i;
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
{
GLuint i;
for (i = 0; i < ctx->Const.MaxTextureUnits; i++) {
@@
-267,7
+267,7
@@
interpolate_specular(GLcontext *ctx, struct sw_span *span)
/* Fill in the span.zArray array from the interpolation values */
void
/* Fill in the span.zArray array from the interpolation values */
void
-_
mesa
_span_interpolate_z( const GLcontext *ctx, struct sw_span *span )
+_
swrast
_span_interpolate_z( const GLcontext *ctx, struct sw_span *span )
{
const GLuint n = span->end;
GLuint i;
{
const GLuint n = span->end;
GLuint i;
@@
-322,7
+322,7
@@
compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
* This is a faster approximation
*/
GLfloat
* This is a faster approximation
*/
GLfloat
-_
mesa
_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+_
swrast
_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
{
GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
GLfloat s, GLfloat t, GLfloat q, GLfloat invQ)
{
@@
-386,7
+386,7
@@
interpolate_texcoords(GLcontext *ctx, struct sw_span *span)
texcoord[i][1] = t * invQ;
texcoord[i][2] = r * invQ;
texcoord[i][3] = q;
texcoord[i][1] = t * invQ;
texcoord[i][2] = r * invQ;
texcoord[i][3] = q;
- lambda[i] = _
mesa
_compute_lambda(dsdx, dsdy, dtdx, dtdy,
+ lambda[i] = _
swrast
_compute_lambda(dsdx, dsdy, dtdx, dtdy,
dqdx, dqdy, texW, texH,
s, t, q, invQ);
s += dsdx;
dqdx, dqdy, texW, texH,
s, t, q, invQ);
s += dsdx;
@@
-465,7
+465,7
@@
interpolate_texcoords(GLcontext *ctx, struct sw_span *span)
GLuint i;
for (i = 0; i < span->end; i++) {
const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
GLuint i;
for (i = 0; i < span->end; i++) {
const GLfloat invQ = (q == 0.0F) ? 1.0F : (1.0F / q);
- lambda[i] = _
mesa
_compute_lambda(dsdx, dsdy, dtdx, dtdy,
+ lambda[i] = _
swrast
_compute_lambda(dsdx, dsdy, dtdx, dtdy,
dqdx, dqdy, texW, texH,
s, t, q, invQ);
texcoord[i][0] = s * invQ;
dqdx, dqdy, texW, texH,
s, t, q, invQ);
texcoord[i][0] = s * invQ;
@@
-641,11
+641,11
@@
multi_write_index_span( GLcontext *ctx, struct sw_span *span )
MEMCPY( indexTmp, span->array->index, span->end * sizeof(GLuint) );
if (ctx->Color.IndexLogicOpEnabled) {
MEMCPY( indexTmp, span->array->index, span->end * sizeof(GLuint) );
if (ctx->Color.IndexLogicOpEnabled) {
- _
mesa
_logicop_ci_span(ctx, span, indexTmp);
+ _
swrast
_logicop_ci_span(ctx, span, indexTmp);
}
if (ctx->Color.IndexMask != 0xffffffff) {
}
if (ctx->Color.IndexMask != 0xffffffff) {
- _
mesa
_mask_index_span(ctx, span, indexTmp);
+ _
swrast
_mask_index_span(ctx, span, indexTmp);
}
if (span->arrayMask & SPAN_XY) {
}
if (span->arrayMask & SPAN_XY) {
@@
-698,14
+698,14
@@
multi_write_rgba_span( GLcontext *ctx, struct sw_span *span )
MEMCPY( rgbaTmp, span->array->rgba, 4 * span->end * sizeof(GLchan) );
if (ctx->Color.ColorLogicOpEnabled) {
MEMCPY( rgbaTmp, span->array->rgba, 4 * span->end * sizeof(GLchan) );
if (ctx->Color.ColorLogicOpEnabled) {
- _
mesa
_logicop_rgba_span(ctx, span, rgbaTmp);
+ _
swrast
_logicop_rgba_span(ctx, span, rgbaTmp);
}
else if (ctx->Color.BlendEnabled) {
}
else if (ctx->Color.BlendEnabled) {
- _
mesa
_blend_span(ctx, span, rgbaTmp);
+ _
swrast
_blend_span(ctx, span, rgbaTmp);
}
if (colorMask != 0xffffffff) {
}
if (colorMask != 0xffffffff) {
- _
mesa
_mask_rgba_span(ctx, span, rgbaTmp);
+ _
swrast
_mask_rgba_span(ctx, span, rgbaTmp);
}
if (span->arrayMask & SPAN_XY) {
}
if (span->arrayMask & SPAN_XY) {
@@
-715,7
+715,7
@@
multi_write_rgba_span( GLcontext *ctx, struct sw_span *span )
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_pixels(ctx, span->end,
+ _
swrast
_write_alpha_pixels(ctx, span->end,
span->array->x, span->array->y,
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
span->array->x, span->array->y,
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
@@
-727,7
+727,7
@@
multi_write_rgba_span( GLcontext *ctx, struct sw_span *span )
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_span(ctx, span->end, span->x, span->y,
+ _
swrast
_write_alpha_span(ctx, span->end, span->x, span->y,
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
}
(const GLchan (*)[4]) rgbaTmp,
span->array->mask);
}
@@
-747,7
+747,7
@@
multi_write_rgba_span( GLcontext *ctx, struct sw_span *span )
* to their original values before returning.
*/
void
* to their original values before returning.
*/
void
-_
mesa
_write_index_span( GLcontext *ctx, struct sw_span *span)
+_
swrast
_write_index_span( GLcontext *ctx, struct sw_span *span)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint origInterpMask = span->interpMask;
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint origInterpMask = span->interpMask;
@@
-797,17
+797,17
@@
_mesa_write_index_span( GLcontext *ctx, struct sw_span *span)
/* Depth test and stencil */
if (ctx->Depth.Test || ctx->Stencil.Enabled) {
if (span->interpMask & SPAN_Z)
/* Depth test and stencil */
if (ctx->Depth.Test || ctx->Stencil.Enabled) {
if (span->interpMask & SPAN_Z)
- _
mesa
_span_interpolate_z(ctx, span);
+ _
swrast
_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
if (ctx->Stencil.Enabled) {
- if (!_
mesa
_stencil_and_ztest_span(ctx, span)) {
+ if (!_
swrast
_stencil_and_ztest_span(ctx, span)) {
span->arrayMask = origArrayMask;
return;
}
}
else {
ASSERT(ctx->Depth.Test);
span->arrayMask = origArrayMask;
return;
}
}
else {
ASSERT(ctx->Depth.Test);
- if (!_
mesa
_depth_test_span(ctx, span)) {
+ if (!_
swrast
_depth_test_span(ctx, span)) {
span->arrayMask = origArrayMask;
return;
}
span->arrayMask = origArrayMask;
return;
}
@@
-833,7
+833,7
@@
_mesa_write_index_span( GLcontext *ctx, struct sw_span *span)
/* Fog */
if (ctx->Fog.Enabled) {
/* Fog */
if (ctx->Fog.Enabled) {
- _
mesa
_fog_ci_span(ctx, span);
+ _
swrast
_fog_ci_span(ctx, span);
}
/* Antialias coverage application */
}
/* Antialias coverage application */
@@
-854,11
+854,11
@@
_mesa_write_index_span( GLcontext *ctx, struct sw_span *span)
else {
/* normal situation: draw to exactly one buffer */
if (ctx->Color.IndexLogicOpEnabled) {
else {
/* normal situation: draw to exactly one buffer */
if (ctx->Color.IndexLogicOpEnabled) {
- _
mesa
_logicop_ci_span(ctx, span, span->array->index);
+ _
swrast
_logicop_ci_span(ctx, span, span->array->index);
}
if (ctx->Color.IndexMask != 0xffffffff) {
}
if (ctx->Color.IndexMask != 0xffffffff) {
- _
mesa
_mask_index_span(ctx, span, span->array->index);
+ _
swrast
_mask_index_span(ctx, span, span->array->index);
}
/* write pixels */
}
/* write pixels */
@@
-904,7
+904,7
@@
_mesa_write_index_span( GLcontext *ctx, struct sw_span *span)
* to their original values before returning.
*/
void
* to their original values before returning.
*/
void
-_
mesa
_write_rgba_span( GLcontext *ctx, struct sw_span *span)
+_
swrast
_write_rgba_span( GLcontext *ctx, struct sw_span *span)
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
@@
-978,7
+978,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
/* Do the alpha test */
if (ctx->Color.AlphaEnabled) {
/* Do the alpha test */
if (ctx->Color.AlphaEnabled) {
- if (!_
mesa
_alpha_test(ctx, span)) {
+ if (!_
swrast
_alpha_test(ctx, span)) {
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
@@
-988,10
+988,10
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
/* Stencil and Z testing */
if (ctx->Stencil.Enabled || ctx->Depth.Test) {
if (span->interpMask & SPAN_Z)
/* Stencil and Z testing */
if (ctx->Stencil.Enabled || ctx->Depth.Test) {
if (span->interpMask & SPAN_Z)
- _
mesa
_span_interpolate_z(ctx, span);
+ _
swrast
_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
if (ctx->Stencil.Enabled) {
- if (!_
mesa
_stencil_and_ztest_span(ctx, span)) {
+ if (!_
swrast
_stencil_and_ztest_span(ctx, span)) {
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
@@
-1001,7
+1001,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
ASSERT(ctx->Depth.Test);
ASSERT(span->arrayMask & SPAN_Z);
/* regular depth testing */
ASSERT(ctx->Depth.Test);
ASSERT(span->arrayMask & SPAN_Z);
/* regular depth testing */
- if (!_
mesa
_depth_test_span(ctx, span)) {
+ if (!_
swrast
_depth_test_span(ctx, span)) {
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
span->interpMask = origInterpMask;
span->arrayMask = origArrayMask;
return;
@@
-1028,7
+1028,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
/* Fog */
if (ctx->Fog.Enabled) {
/* Fog */
if (ctx->Fog.Enabled) {
- _
mesa
_fog_rgba_span(ctx, span);
+ _
swrast
_fog_rgba_span(ctx, span);
monoColor = GL_FALSE;
}
monoColor = GL_FALSE;
}
@@
-1049,17
+1049,17
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
else {
/* normal: write to exactly one buffer */
if (ctx->Color.ColorLogicOpEnabled) {
else {
/* normal: write to exactly one buffer */
if (ctx->Color.ColorLogicOpEnabled) {
- _
mesa
_logicop_rgba_span(ctx, span, span->array->rgba);
+ _
swrast
_logicop_rgba_span(ctx, span, span->array->rgba);
monoColor = GL_FALSE;
}
else if (ctx->Color.BlendEnabled) {
monoColor = GL_FALSE;
}
else if (ctx->Color.BlendEnabled) {
- _
mesa
_blend_span(ctx, span, span->array->rgba);
+ _
swrast
_blend_span(ctx, span, span->array->rgba);
monoColor = GL_FALSE;
}
/* Color component masking */
if (colorMask != 0xffffffff) {
monoColor = GL_FALSE;
}
/* Color component masking */
if (colorMask != 0xffffffff) {
- _
mesa
_mask_rgba_span(ctx, span, span->array->rgba);
+ _
swrast
_mask_rgba_span(ctx, span, span->array->rgba);
monoColor = GL_FALSE;
}
monoColor = GL_FALSE;
}
@@
-1070,7
+1070,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
(*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
(*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_pixels(ctx, span->end,
+ _
swrast
_write_alpha_pixels(ctx, span->end,
span->array->x, span->array->y,
(const GLchan (*)[4]) span->array->rgba,
span->array->mask);
span->array->x, span->array->y,
(const GLchan (*)[4]) span->array->rgba,
span->array->mask);
@@
-1088,7
+1088,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
(*swrast->Driver.WriteMonoRGBASpan)(ctx, span->end, span->x,
span->y, color, span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
(*swrast->Driver.WriteMonoRGBASpan)(ctx, span->end, span->x,
span->y, color, span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_mono_alpha_span(ctx, span->end, span->x, span->y,
+ _
swrast
_write_mono_alpha_span(ctx, span->end, span->x, span->y,
color[ACOMP],
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
}
color[ACOMP],
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
}
@@
-1099,7
+1099,7
@@
_mesa_write_rgba_span( GLcontext *ctx, struct sw_span *span)
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_span(ctx, span->end, span->x, span->y,
+ _
swrast
_write_alpha_span(ctx, span->end, span->x, span->y,
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
}
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? ((const GLubyte *) NULL) : span->array->mask);
}
@@
-1144,7
+1144,7
@@
add_colors(GLuint n, GLchan rgba[][4], GLchan specular[][4] )
* to their original values before returning.
*/
void
* to their original values before returning.
*/
void
-_
mesa
_write_texture_span( GLcontext *ctx, struct sw_span *span)
+_
swrast
_write_texture_span( GLcontext *ctx, struct sw_span *span)
{
const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
SWcontext *swrast = SWRAST_CONTEXT(ctx);
{
const GLuint colorMask = *((GLuint *) ctx->Color.ColorMask);
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1216,7
+1216,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
_swrast_texture_span( ctx, span );
/* Do the alpha test */
_swrast_texture_span( ctx, span );
/* Do the alpha test */
- if (!_
mesa
_alpha_test(ctx, span)) {
+ if (!_
swrast
_alpha_test(ctx, span)) {
span->arrayMask = origArrayMask;
return;
}
span->arrayMask = origArrayMask;
return;
}
@@
-1225,10
+1225,10
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
/* Stencil and Z testing */
if (ctx->Stencil.Enabled || ctx->Depth.Test) {
if (span->interpMask & SPAN_Z)
/* Stencil and Z testing */
if (ctx->Stencil.Enabled || ctx->Depth.Test) {
if (span->interpMask & SPAN_Z)
- _
mesa
_span_interpolate_z(ctx, span);
+ _
swrast
_span_interpolate_z(ctx, span);
if (ctx->Stencil.Enabled) {
if (ctx->Stencil.Enabled) {
- if (!_
mesa
_stencil_and_ztest_span(ctx, span)) {
+ if (!_
swrast
_stencil_and_ztest_span(ctx, span)) {
span->arrayMask = origArrayMask;
return;
}
span->arrayMask = origArrayMask;
return;
}
@@
-1237,7
+1237,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
ASSERT(ctx->Depth.Test);
ASSERT(span->arrayMask & SPAN_Z);
/* regular depth testing */
ASSERT(ctx->Depth.Test);
ASSERT(span->arrayMask & SPAN_Z);
/* regular depth testing */
- if (!_
mesa
_depth_test_span(ctx, span)) {
+ if (!_
swrast
_depth_test_span(ctx, span)) {
span->arrayMask = origArrayMask;
return;
}
span->arrayMask = origArrayMask;
return;
}
@@
-1283,7
+1283,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
/* Fog */
if (ctx->Fog.Enabled) {
/* Fog */
if (ctx->Fog.Enabled) {
- _
mesa
_fog_rgba_span(ctx, span);
+ _
swrast
_fog_rgba_span(ctx, span);
}
/* Antialias coverage application */
}
/* Antialias coverage application */
@@
-1302,14
+1302,14
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
else {
/* normal: write to exactly one buffer */
if (ctx->Color.ColorLogicOpEnabled) {
else {
/* normal: write to exactly one buffer */
if (ctx->Color.ColorLogicOpEnabled) {
- _
mesa
_logicop_rgba_span(ctx, span, span->array->rgba);
+ _
swrast
_logicop_rgba_span(ctx, span, span->array->rgba);
}
else if (ctx->Color.BlendEnabled) {
}
else if (ctx->Color.BlendEnabled) {
- _
mesa
_blend_span(ctx, span, span->array->rgba);
+ _
swrast
_blend_span(ctx, span, span->array->rgba);
}
if (colorMask != 0xffffffff) {
}
if (colorMask != 0xffffffff) {
- _
mesa
_mask_rgba_span(ctx, span, span->array->rgba);
+ _
swrast
_mask_rgba_span(ctx, span, span->array->rgba);
}
}
@@
-1318,7
+1318,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
(*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
(*swrast->Driver.WriteRGBAPixels)(ctx, span->end, span->array->x,
span->array->y, (const GLchan (*)[4]) span->array->rgba, span->array->mask);
if (SWRAST_CONTEXT(ctx)->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_pixels(ctx, span->end,
+ _
swrast
_write_alpha_pixels(ctx, span->end,
span->array->x, span->array->y,
(const GLchan (*)[4]) span->array->rgba,
span->array->mask);
span->array->x, span->array->y,
(const GLchan (*)[4]) span->array->rgba,
span->array->mask);
@@
-1330,7
+1330,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? NULL : span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? NULL : span->array->mask);
if (swrast->_RasterMask & ALPHABUF_BIT) {
- _
mesa
_write_alpha_span(ctx, span->end, span->x, span->y,
+ _
swrast
_write_alpha_span(ctx, span->end, span->x, span->y,
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? NULL : span->array->mask);
}
(const GLchan (*)[4]) span->array->rgba,
span->writeAll ? NULL : span->array->mask);
}
@@
-1347,7
+1347,7
@@
_mesa_write_texture_span( GLcontext *ctx, struct sw_span *span)
* reading ouside the buffer's boundaries.
*/
void
* reading ouside the buffer's boundaries.
*/
void
-_
mesa
_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
+_
swrast
_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint n, GLint x, GLint y, GLchan rgba[][4] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1390,7
+1390,7
@@
_mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
(*swrast->Driver.ReadRGBASpan)( ctx, length, x + skip, y, rgba + skip );
if (buffer->UseSoftwareAlphaBuffers) {
(*swrast->Driver.ReadRGBASpan)( ctx, length, x + skip, y, rgba + skip );
if (buffer->UseSoftwareAlphaBuffers) {
- _
mesa
_read_alpha_span(ctx, length, x + skip, y, rgba + skip);
+ _
swrast
_read_alpha_span(ctx, length, x + skip, y, rgba + skip);
}
}
}
}
}
}
@@
-1401,7
+1401,7
@@
_mesa_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
* reading ouside the buffer's boundaries.
*/
void
* reading ouside the buffer's boundaries.
*/
void
-_
mesa
_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
+_
swrast
_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
GLuint n, GLint x, GLint y, GLuint indx[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLuint n, GLint x, GLint y, GLuint indx[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
diff --git
a/src/mesa/swrast/s_span.h
b/src/mesa/swrast/s_span.h
index d43aa1ae394532efdfe2ccf8a983361f36f966e2..b4ec957db318b09eab96538a4e1744d608cd380e 100644
(file)
--- a/
src/mesa/swrast/s_span.h
+++ b/
src/mesa/swrast/s_span.h
@@
-1,4
+1,4
@@
-/* $Id: s_span.h,v 1.1
8 2003/03/15 17:33:28
brianp Exp $ */
+/* $Id: s_span.h,v 1.1
9 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-34,43
+34,43
@@
extern void
extern void
-_
mesa
_span_default_z( GLcontext *ctx, struct sw_span *span );
+_
swrast
_span_default_z( GLcontext *ctx, struct sw_span *span );
extern void
extern void
-_
mesa
_span_interpolate_z( const GLcontext *ctx, struct sw_span *span );
+_
swrast
_span_interpolate_z( const GLcontext *ctx, struct sw_span *span );
extern void
extern void
-_
mesa
_span_default_fog( GLcontext *ctx, struct sw_span *span );
+_
swrast
_span_default_fog( GLcontext *ctx, struct sw_span *span );
extern void
extern void
-_
mesa
_span_default_color( GLcontext *ctx, struct sw_span *span );
+_
swrast
_span_default_color( GLcontext *ctx, struct sw_span *span );
extern void
extern void
-_
mesa
_span_default_texcoords( GLcontext *ctx, struct sw_span *span );
+_
swrast
_span_default_texcoords( GLcontext *ctx, struct sw_span *span );
extern GLfloat
extern GLfloat
-_
mesa
_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
+_
swrast
_compute_lambda(GLfloat dsdx, GLfloat dsdy, GLfloat dtdx, GLfloat dtdy,
GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
extern void
GLfloat dqdx, GLfloat dqdy, GLfloat texW, GLfloat texH,
GLfloat s, GLfloat t, GLfloat q, GLfloat invQ);
extern void
-_
mesa
_write_index_span( GLcontext *ctx, struct sw_span *span);
+_
swrast
_write_index_span( GLcontext *ctx, struct sw_span *span);
extern void
extern void
-_
mesa
_write_rgba_span( GLcontext *ctx, struct sw_span *span);
+_
swrast
_write_rgba_span( GLcontext *ctx, struct sw_span *span);
extern void
extern void
-_
mesa
_write_texture_span( GLcontext *ctx, struct sw_span *span);
+_
swrast
_write_texture_span( GLcontext *ctx, struct sw_span *span);
extern void
extern void
-_
mesa
_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
+_
swrast
_read_rgba_span( GLcontext *ctx, GLframebuffer *buffer,
GLuint n, GLint x, GLint y, GLchan rgba[][4] );
extern void
GLuint n, GLint x, GLint y, GLchan rgba[][4] );
extern void
-_
mesa
_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
+_
swrast
_read_index_span( GLcontext *ctx, GLframebuffer *buffer,
GLuint n, GLint x, GLint y, GLuint indx[] );
#endif
GLuint n, GLint x, GLint y, GLuint indx[] );
#endif
diff --git
a/src/mesa/swrast/s_stencil.c
b/src/mesa/swrast/s_stencil.c
index 94ebe8739753fdf45f6ff505773bf8882cc33e7a..e6282c5af76dd0125e49fb5cc79fa7e30f20497e 100644
(file)
--- a/
src/mesa/swrast/s_stencil.c
+++ b/
src/mesa/swrast/s_stencil.c
@@
-1,4
+1,4
@@
-/* $Id: s_stencil.c,v 1.2
8 2002/10/24 23:57:24
brianp Exp $ */
+/* $Id: s_stencil.c,v 1.2
9 2003/03/25 02:23:47
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-477,7
+477,7
@@
stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span, GLuint face)
MEMCPY(oldmask, mask, n * sizeof(GLubyte));
/* apply the depth test */
MEMCPY(oldmask, mask, n * sizeof(GLubyte));
/* apply the depth test */
- _
mesa
_depth_test_span(ctx, span);
+ _
swrast
_depth_test_span(ctx, span);
/* Set the stencil pass/fail flags according to result of depth testing.
* if oldmask[i] == 0 then
/* Set the stencil pass/fail flags according to result of depth testing.
* if oldmask[i] == 0 then
@@
-927,7
+927,7
@@
stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
n, stencil, mask);
}
else {
n, stencil, mask);
}
else {
- _
mesa
_depth_test_span(ctx, span);
+ _
swrast
_depth_test_span(ctx, span);
if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
GLubyte failmask[MAX_WIDTH];
if (ctx->Stencil.ZFailFunc[face] != GL_KEEP) {
GLubyte failmask[MAX_WIDTH];
@@
-976,7
+976,7
@@
stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
MEMCPY(oldmask, mask, n * sizeof(GLubyte));
MEMCPY(oldmask, mask, n * sizeof(GLubyte));
- _
mesa
_depth_test_span(ctx, span);
+ _
swrast
_depth_test_span(ctx, span);
for (i=0;i<n;i++) {
ASSERT(mask[i] == 0 || mask[i] == 1);
for (i=0;i<n;i++) {
ASSERT(mask[i] == 0 || mask[i] == 1);
@@
-1006,7
+1006,7
@@
stencil_and_ztest_pixels( GLcontext *ctx, struct sw_span *span, GLuint face )
* GL_FALSE = all fragments failed.
*/
GLboolean
* GL_FALSE = all fragments failed.
*/
GLboolean
-_
mesa
_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span)
+_
swrast
_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span)
{
/* span->facing can only be non-zero if using two-sided stencil */
ASSERT(ctx->Stencil.TestTwoSide || span->facing == 0);
{
/* span->facing can only be non-zero if using two-sided stencil */
ASSERT(ctx->Stencil.TestTwoSide || span->facing == 0);
@@
-1025,7
+1025,7
@@
_mesa_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span)
* Output: stencil - the array of stencil values
*/
void
* Output: stencil - the array of stencil values
*/
void
-_
mesa
_read_stencil_span( GLcontext *ctx,
+_
swrast
_read_stencil_span( GLcontext *ctx,
GLint n, GLint x, GLint y, GLstencil stencil[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
GLint n, GLint x, GLint y, GLstencil stencil[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1078,7
+1078,7
@@
_mesa_read_stencil_span( GLcontext *ctx,
* stencil - the array of stencil values
*/
void
* stencil - the array of stencil values
*/
void
-_
mesa
_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+_
swrast
_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
const GLstencil stencil[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
const GLstencil stencil[] )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
@@
-1127,7
+1127,7
@@
_mesa_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
* deallocated first. The new stencil buffer will be uninitialized.
*/
void
* deallocated first. The new stencil buffer will be uninitialized.
*/
void
-_
mesa
_alloc_stencil_buffer( GLframebuffer *buffer )
+_
swrast
_alloc_stencil_buffer( GLframebuffer *buffer )
{
/* deallocate current stencil buffer if present */
if (buffer->Stencil) {
{
/* deallocate current stencil buffer if present */
if (buffer->Stencil) {
@@
-1140,7
+1140,7
@@
_mesa_alloc_stencil_buffer( GLframebuffer *buffer )
MESA_PBUFFER_ALLOC(buffer->Width * buffer->Height * sizeof(GLstencil));
if (!buffer->Stencil) {
/* out of memory */
MESA_PBUFFER_ALLOC(buffer->Width * buffer->Height * sizeof(GLstencil));
if (!buffer->Stencil) {
/* out of memory */
- _mesa_error( NULL, GL_OUT_OF_MEMORY, "_
mesa
_alloc_stencil_buffer" );
+ _mesa_error( NULL, GL_OUT_OF_MEMORY, "_
swrast
_alloc_stencil_buffer" );
}
}
}
}
@@
-1314,7
+1314,7
@@
clear_hardware_stencil_buffer( GLcontext *ctx )
* Clear the stencil buffer (hardware or software).
*/
void
* Clear the stencil buffer (hardware or software).
*/
void
-_
mesa
_clear_stencil_buffer( GLcontext *ctx )
+_
swrast
_clear_stencil_buffer( GLcontext *ctx )
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
if (swrast->Driver.WriteStencilSpan) {
{
SWcontext *swrast = SWRAST_CONTEXT(ctx);
if (swrast->Driver.WriteStencilSpan) {
diff --git
a/src/mesa/swrast/s_stencil.h
b/src/mesa/swrast/s_stencil.h
index b174f2e01e1d43a72cf8b6a22b1d9d4b47dfe6a7..af95909a12e6ca99b46ae58967fb656f53afcf4c 100644
(file)
--- a/
src/mesa/swrast/s_stencil.h
+++ b/
src/mesa/swrast/s_stencil.h
@@
-1,4
+1,4
@@
-/* $Id: s_stencil.h,v 1.
9 2002/10/02 23:24:04
brianp Exp $ */
+/* $Id: s_stencil.h,v 1.
10 2003/03/25 02:23:48
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-35,26
+35,26
@@
extern GLboolean
extern GLboolean
-_
mesa
_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span);
+_
swrast
_stencil_and_ztest_span(GLcontext *ctx, struct sw_span *span);
extern void
extern void
-_
mesa
_read_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+_
swrast
_read_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
GLstencil stencil[] );
extern void
GLstencil stencil[] );
extern void
-_
mesa
_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
+_
swrast
_write_stencil_span( GLcontext *ctx, GLint n, GLint x, GLint y,
const GLstencil stencil[] );
extern void
const GLstencil stencil[] );
extern void
-_
mesa
_alloc_stencil_buffer( GLframebuffer *buffer );
+_
swrast
_alloc_stencil_buffer( GLframebuffer *buffer );
extern void
extern void
-_
mesa
_clear_stencil_buffer( GLcontext *ctx );
+_
swrast
_clear_stencil_buffer( GLcontext *ctx );
#endif
#endif
diff --git
a/src/mesa/swrast/s_texstore.c
b/src/mesa/swrast/s_texstore.c
index e87945ab42db298ecc6bf7fd0b6b4910a1634239..7101328974bd64f992e002bd6c2e19d06c982afd 100644
(file)
--- a/
src/mesa/swrast/s_texstore.c
+++ b/
src/mesa/swrast/s_texstore.c
@@
-1,4
+1,4
@@
-/* $Id: s_texstore.c,v 1.1
0 2003/03/01 01:50:26
brianp Exp $ */
+/* $Id: s_texstore.c,v 1.1
1 2003/03/25 02:23:48
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-81,7
+81,7
@@
read_color_image( GLcontext *ctx, GLint x, GLint y,
dst = image;
stride = width * 4;
for (i = 0; i < height; i++) {
dst = image;
stride = width * 4;
for (i = 0; i < height; i++) {
- _
mesa
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
+ _
swrast
_read_rgba_span( ctx, ctx->ReadBuffer, width, x, y + i,
(GLchan (*)[4]) dst );
dst += stride;
}
(GLchan (*)[4]) dst );
dst += stride;
}
@@
-114,7
+114,7
@@
read_depth_image( GLcontext *ctx, GLint x, GLint y,
dst = image;
for (i = 0; i < height; i++) {
dst = image;
for (i = 0; i < height; i++) {
- _
mesa
_read_depth_span_float(ctx, width, x, y + i, dst);
+ _
swrast
_read_depth_span_float(ctx, width, x, y + i, dst);
dst += width;
}
dst += width;
}
diff --git
a/src/mesa/swrast/s_triangle.c
b/src/mesa/swrast/s_triangle.c
index fce782466f0841812295697495f0328a9ea34226..aee92aecbb1369c1bf02a413c7a74be091e72ac4 100644
(file)
--- a/
src/mesa/swrast/s_triangle.c
+++ b/
src/mesa/swrast/s_triangle.c
@@
-1,4
+1,4
@@
-/* $Id: s_triangle.c,v 1.
69 2003/03/16 22:02:3
8 brianp Exp $ */
+/* $Id: s_triangle.c,v 1.
70 2003/03/25 02:23:4
8 brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-51,7
+51,7
@@
/*
* Just used for feedback mode.
*/
/*
* Just used for feedback mode.
*/
-GLboolean _
mesa_cull_
triangle( GLcontext *ctx,
+GLboolean _
swrast_cull
triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
const SWvertex *v0,
const SWvertex *v1,
const SWvertex *v2 )
@@
-80,7
+80,7
@@
GLboolean _mesa_cull_triangle( GLcontext *ctx,
span.interpMask |= SPAN_INDEX; \
span.index = IntToFixed(v2->index); \
span.indexStep = 0;
span.interpMask |= SPAN_INDEX; \
span.index = IntToFixed(v2->index); \
span.indexStep = 0;
-#define RENDER_SPAN( span ) _
mesa
_write_index_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_index_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-92,7
+92,7
@@
GLboolean _mesa_cull_triangle( GLcontext *ctx,
#define INTERP_Z 1
#define INTERP_FOG 1
#define INTERP_INDEX 1
#define INTERP_Z 1
#define INTERP_FOG 1
#define INTERP_INDEX 1
-#define RENDER_SPAN( span ) _
mesa
_write_index_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_index_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-116,7
+116,7
@@
GLboolean _mesa_cull_triangle( GLcontext *ctx,
span.greenStep = 0; \
span.blueStep = 0; \
span.alphaStep = 0;
span.greenStep = 0; \
span.blueStep = 0; \
span.alphaStep = 0;
-#define RENDER_SPAN( span ) _
mesa
_write_rgba_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_rgba_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-136,7
+136,7
@@
GLboolean _mesa_cull_triangle( GLcontext *ctx,
ASSERT(ctx->Texture._EnabledUnits == 0); \
ASSERT(ctx->Light.ShadeModel==GL_SMOOTH); \
}
ASSERT(ctx->Texture._EnabledUnits == 0); \
ASSERT(ctx->Light.ShadeModel==GL_SMOOTH); \
}
-#define RENDER_SPAN( span ) _
mesa
_write_rgba_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_rgba_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-514,7
+514,7
@@
affine_span(GLcontext *ctx, struct sw_span *span,
}
span->interpMask &= ~SPAN_RGBA;
ASSERT(span->arrayMask & SPAN_RGBA);
}
span->interpMask &= ~SPAN_RGBA;
ASSERT(span->arrayMask & SPAN_RGBA);
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#undef SPAN_NEAREST
#undef SPAN_LINEAR
#undef SPAN_NEAREST
#undef SPAN_LINEAR
@@
-784,7
+784,7
@@
fast_persp_span(GLcontext *ctx, struct sw_span *span,
}
ASSERT(span->arrayMask & SPAN_RGBA);
}
ASSERT(span->arrayMask & SPAN_RGBA);
- _
mesa
_write_rgba_span(ctx, span);
+ _
swrast
_write_rgba_span(ctx, span);
#undef SPAN_NEAREST
#undef SPAN_LINEAR
#undef SPAN_NEAREST
#undef SPAN_LINEAR
@@
-877,7
+877,7
@@
fast_persp_span(GLcontext *ctx, struct sw_span *span,
#define INTERP_SPEC 1
#define INTERP_ALPHA 1
#define INTERP_TEX 1
#define INTERP_SPEC 1
#define INTERP_ALPHA 1
#define INTERP_TEX 1
-#define RENDER_SPAN( span ) _
mesa
_write_texture_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_texture_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-896,7
+896,7
@@
fast_persp_span(GLcontext *ctx, struct sw_span *span,
#define INTERP_ALPHA 1
#define INTERP_SPEC 1
#define INTERP_MULTITEX 1
#define INTERP_ALPHA 1
#define INTERP_SPEC 1
#define INTERP_MULTITEX 1
-#define RENDER_SPAN( span ) _
mesa
_write_texture_span(ctx, &span);
+#define RENDER_SPAN( span ) _
swrast
_write_texture_span(ctx, &span);
#include "s_tritemp.h"
#include "s_tritemp.h"
@@
-1031,7
+1031,7
@@
_swrast_choose_triangle( GLcontext *ctx )
if (ctx->RenderMode==GL_RENDER) {
if (ctx->Polygon.SmoothFlag) {
if (ctx->RenderMode==GL_RENDER) {
if (ctx->Polygon.SmoothFlag) {
- _
mesa
_set_aa_triangle_function(ctx);
+ _
swrast
_set_aa_triangle_function(ctx);
ASSERT(swrast->Triangle);
return;
}
ASSERT(swrast->Triangle);
return;
}
@@
-1143,10
+1143,10
@@
_swrast_choose_triangle( GLcontext *ctx )
}
}
else if (ctx->RenderMode==GL_FEEDBACK) {
}
}
else if (ctx->RenderMode==GL_FEEDBACK) {
- USE(_
mesa
_feedback_triangle);
+ USE(_
swrast
_feedback_triangle);
}
else {
/* GL_SELECT mode */
}
else {
/* GL_SELECT mode */
- USE(_
mesa
_select_triangle);
+ USE(_
swrast
_select_triangle);
}
}
}
}
diff --git
a/src/mesa/swrast/s_triangle.h
b/src/mesa/swrast/s_triangle.h
index 576038db72046e63a7c21565c8fba1b6b9e01062..09b47852e663b040e8fe7fb9acbe805fe42e58b2 100644
(file)
--- a/
src/mesa/swrast/s_triangle.h
+++ b/
src/mesa/swrast/s_triangle.h
@@
-1,10
+1,10
@@
-/* $Id: s_triangle.h,v 1.
7 2001/03/12 00:48:42 gareth
Exp $ */
+/* $Id: s_triangle.h,v 1.
8 2003/03/25 02:23:48 brianp
Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
- * Version:
3.5
+ * Version:
5.1
*
*
- * Copyright (C) 1999-200
1
Brian Paul All Rights Reserved.
+ * Copyright (C) 1999-200
3
Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@
-25,9
+25,6
@@
*/
*/
-
-
-
#ifndef S_TRIANGLES_H
#define S_TRIANGLES_H
#ifndef S_TRIANGLES_H
#define S_TRIANGLES_H
@@
-36,16
+33,16
@@
#include "swrast.h"
#include "swrast.h"
-GLboolean _mesa_cull_triangle( GLcontext *ctx,
-
const SWvertex *v0
,
-
const SWvertex *v1
,
- const SWvertex *v2);
-
+extern GLboolean
+
_swrast_culltriangle( GLcontext *ctx
,
+
const SWvertex *v0
,
+ const SWvertex *v1,
+ const SWvertex *v2);
-void
+
extern
void
_swrast_choose_triangle( GLcontext *ctx );
_swrast_choose_triangle( GLcontext *ctx );
-void
+
extern
void
_swrast_add_spec_terms_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
_swrast_add_spec_terms_triangle( GLcontext *ctx,
const SWvertex *v0,
const SWvertex *v1,
diff --git
a/src/mesa/swrast/s_tritemp.h
b/src/mesa/swrast/s_tritemp.h
index b5273500ce359f1758e1f6bec24fdb7c80596efb..187496689613424d8e691b7b9d860dacce02143c 100644
(file)
--- a/
src/mesa/swrast/s_tritemp.h
+++ b/
src/mesa/swrast/s_tritemp.h
@@
-1,4
+1,4
@@
-/* $Id: s_tritemp.h,v 1.4
7 2003/03/16 22:02:40
brianp Exp $ */
+/* $Id: s_tritemp.h,v 1.4
8 2003/03/25 02:23:48
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-701,7
+701,7
@@
static void NAME(GLcontext *ctx, const SWvertex *v0,
}
# ifdef DEPTH_TYPE
zRow = (DEPTH_TYPE *)
}
# ifdef DEPTH_TYPE
zRow = (DEPTH_TYPE *)
- _
mesa
_zbuffer_address(ctx, FixedToInt(fxLeftEdge), span.y);
+ _
swrast
_zbuffer_address(ctx, FixedToInt(fxLeftEdge), span.y);
dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
# endif
}
dZRowOuter = (ctx->DrawBuffer->Width + idxOuter) * sizeof(DEPTH_TYPE);
# endif
}
diff --git
a/src/mesa/swrast/s_zoom.c
b/src/mesa/swrast/s_zoom.c
index f4fde9b31e5cc7d15296ffa7c808e872f8b33d61..6cc9be587c4556f9779a6417249f3428e7d805d3 100644
(file)
--- a/
src/mesa/swrast/s_zoom.c
+++ b/
src/mesa/swrast/s_zoom.c
@@
-1,4
+1,4
@@
-/* $Id: s_zoom.c,v 1.2
3 2003/03/01 01:50:26
brianp Exp $ */
+/* $Id: s_zoom.c,v 1.2
4 2003/03/25 02:23:48
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-36,7
+36,7
@@
/*
/*
- * Helper function called from _
mesa
_write_zoomed_rgba/rgb/index_span().
+ * Helper function called from _
swrast
_write_zoomed_rgba/rgb/index_span().
*/
static void
zoom_span( GLcontext *ctx, const struct sw_span *span,
*/
static void
zoom_span( GLcontext *ctx, const struct sw_span *span,
@@
-219,7
+219,7
@@
zoom_span( GLcontext *ctx, const struct sw_span *span,
/* write the span in rows [r0, r1) */
if (format == GL_RGBA || format == GL_RGB) {
/* Writing the span may modify the colors, so make a backup now if we're
/* write the span in rows [r0, r1) */
if (format == GL_RGBA || format == GL_RGB) {
/* Writing the span may modify the colors, so make a backup now if we're
- * going to call _
mesa
_write_zoomed_span() more than once.
+ * going to call _
swrast
_write_zoomed_span() more than once.
* Also, clipping may change the span end value, so store it as well.
*/
const GLint end = zoomed.end; /* save */
* Also, clipping may change the span end value, so store it as well.
*/
const GLint end = zoomed.end; /* save */
@@
-227,7
+227,7
@@
zoom_span( GLcontext *ctx, const struct sw_span *span,
MEMCPY(rgbaSave, zoomed.array->rgba, zoomed.end * 4 * sizeof(GLchan));
}
for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
MEMCPY(rgbaSave, zoomed.array->rgba, zoomed.end * 4 * sizeof(GLchan));
}
for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
- _
mesa
_write_rgba_span(ctx, &zoomed);
+ _
swrast
_write_rgba_span(ctx, &zoomed);
zoomed.end = end; /* restore */
if (r1 - r0 > 1) {
/* restore the colors */
zoomed.end = end; /* restore */
if (r1 - r0 > 1) {
/* restore the colors */
@@
-241,7
+241,7
@@
zoom_span( GLcontext *ctx, const struct sw_span *span,
MEMCPY(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint));
}
for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
MEMCPY(indexSave, zoomed.array->index, zoomed.end * sizeof(GLuint));
}
for (zoomed.y = r0; zoomed.y < r1; zoomed.y++) {
- _
mesa
_write_index_span(ctx, &zoomed);
+ _
swrast
_write_index_span(ctx, &zoomed);
zoomed.end = end; /* restore */
if (r1 - r0 > 1) {
/* restore the colors */
zoomed.end = end; /* restore */
if (r1 - r0 > 1) {
/* restore the colors */
@@
-253,7
+253,7
@@
zoom_span( GLcontext *ctx, const struct sw_span *span,
void
void
-_
mesa
_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
CONST GLchan rgba[][4], GLint y0,
GLint skipPixels )
{
CONST GLchan rgba[][4], GLint y0,
GLint skipPixels )
{
@@
-262,7
+262,7
@@
_mesa_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
void
void
-_
mesa
_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
CONST GLchan rgb[][3], GLint y0,
GLint skipPixels )
{
CONST GLchan rgb[][3], GLint y0,
GLint skipPixels )
{
@@
-271,7
+271,7
@@
_mesa_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
void
void
-_
mesa
_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
GLint y0, GLint skipPixels )
{
zoom_span(ctx, span, (const GLvoid *) span->array->index, y0,
GLint y0, GLint skipPixels )
{
zoom_span(ctx, span, (const GLvoid *) span->array->index, y0,
@@
-283,7
+283,7
@@
_mesa_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
* As above, but write stencil values.
*/
void
* As above, but write stencil values.
*/
void
-_
mesa
_write_zoomed_stencil_span( GLcontext *ctx,
+_
swrast
_write_zoomed_stencil_span( GLcontext *ctx,
GLuint n, GLint x, GLint y,
const GLstencil stencil[], GLint y0,
GLint skipPixels )
GLuint n, GLint x, GLint y,
const GLstencil stencil[], GLint y0,
GLint skipPixels )
@@
-365,6
+365,6
@@
_mesa_write_zoomed_stencil_span( GLcontext *ctx,
/* write the span */
for (r=r0; r<r1; r++) {
/* write the span */
for (r=r0; r<r1; r++) {
- _
mesa
_write_stencil_span( ctx, m, x+skipcol, r, zstencil );
+ _
swrast
_write_stencil_span( ctx, m, x+skipcol, r, zstencil );
}
}
}
}
diff --git
a/src/mesa/swrast/s_zoom.h
b/src/mesa/swrast/s_zoom.h
index 54ccf69eb80f39a9908016f614dd811dffad8a9e..75cb404f8862ef78de8be3c447c862c79ed84821 100644
(file)
--- a/
src/mesa/swrast/s_zoom.h
+++ b/
src/mesa/swrast/s_zoom.h
@@
-1,4
+1,4
@@
-/* $Id: s_zoom.h,v 1.
8 2002/12/05 04:48:53
brianp Exp $ */
+/* $Id: s_zoom.h,v 1.
9 2003/03/25 02:23:48
brianp Exp $ */
/*
* Mesa 3-D graphics library
/*
* Mesa 3-D graphics library
@@
-31,21
+31,21
@@
#include "swrast.h"
extern void
#include "swrast.h"
extern void
-_
mesa
_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_rgba_span( GLcontext *ctx, const struct sw_span *span,
CONST GLchan rgb[][4], GLint y0,
GLint skipPixels );
extern void
CONST GLchan rgb[][4], GLint y0,
GLint skipPixels );
extern void
-_
mesa
_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_rgb_span( GLcontext *ctx, const struct sw_span *span,
CONST GLchan rgb[][3], GLint y0,
GLint skipPixels );
extern void
CONST GLchan rgb[][3], GLint y0,
GLint skipPixels );
extern void
-_
mesa
_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
+_
swrast
_write_zoomed_index_span( GLcontext *ctx, const struct sw_span *span,
GLint y0, GLint skipPixels );
extern void
GLint y0, GLint skipPixels );
extern void
-_
mesa
_write_zoomed_stencil_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
+_
swrast
_write_zoomed_stencil_span( GLcontext *ctx, GLuint n, GLint x, GLint y,
const GLstencil stencil[], GLint y0,
GLint skipPixels );
const GLstencil stencil[], GLint y0,
GLint skipPixels );