diff options
| author | Kendall Bennett <KendallB@scitechsoft.com> | 2003-10-22 21:02:15 +0000 |
|---|---|---|
| committer | Kendall Bennett <KendallB@scitechsoft.com> | 2003-10-22 21:02:15 +0000 |
| commit | 15c37348a5d47ece17ffef38978aa8253363e6ee (patch) | |
| tree | 9158589d812955dbb7a8c4b210e592de6cc255c9 /src/mesa/swrast | |
| parent | 23f45833aa6c9b90f48ce5aa08dca6dadc49f62f (diff) | |
More SciTech SNAP updates. Some of these files didn't really change, but
they show up in the list (GLU stuff) for some reason. The major change
here is the addition of code in the glx86asm.py file to generate assembler
stub entry points with the correct name decorations for _stdcall calling
conventions so this can be used on Windows boxes.
Diffstat (limited to 'src/mesa/swrast')
| -rw-r--r-- | src/mesa/swrast/s_context.c | 2 | ||||
| -rw-r--r-- | src/mesa/swrast/s_context.h | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/mesa/swrast/s_context.c b/src/mesa/swrast/s_context.c index c720d72de2..09eb614ac5 100644 --- a/src/mesa/swrast/s_context.c +++ b/src/mesa/swrast/s_context.c @@ -269,7 +269,7 @@ _swrast_validate_point( GLcontext *ctx, const SWvertex *v0 ) } -static void GLAPIENTRY +static void _ASMAPI _swrast_validate_blend_func( GLcontext *ctx, GLuint n, const GLubyte mask[], GLchan src[][4], diff --git a/src/mesa/swrast/s_context.h b/src/mesa/swrast/s_context.h index c699078e16..6dc8b13b0e 100644 --- a/src/mesa/swrast/s_context.h +++ b/src/mesa/swrast/s_context.h @@ -202,14 +202,9 @@ typedef void (*texture_sample_func)(GLcontext *ctx, GLuint texUnit, GLuint n, const GLfloat texcoords[][4], const GLfloat lambda[], GLchan rgba[][4]); -#ifdef USE_MMX_ASM typedef void (_ASMAPIP blend_func)( GLcontext *ctx, GLuint n, const GLubyte mask[], GLchan src[][4], CONST GLchan dst[][4] ); -#else -typedef void (*blend_func)( GLcontext *ctx, GLuint n, const GLubyte mask[], - GLchan src[][4], CONST GLchan dst[][4] ); -#endif typedef void (*swrast_point_func)( GLcontext *ctx, const SWvertex *); |