summaryrefslogtreecommitdiff
path: root/src/mesa/drivers/dri/s3v/s3v_state.c
diff options
context:
space:
mode:
authorAdam Jackson <ajax@freedesktop.org>2004-12-27 20:31:56 +0000
committerAdam Jackson <ajax@freedesktop.org>2004-12-27 20:31:56 +0000
commitc3eaa17b37ef83d43a4de211c1b4f616b3bc0a3d (patch)
treeb1cee126821cce46d6d1b86dbe8a5b9e4c6e27ce /src/mesa/drivers/dri/s3v/s3v_state.c
parent99edafd4e87fdfb53a46d10d497250a9ba1fa91b (diff)
Get s3v building with a minimum of warnings.
Diffstat (limited to 'src/mesa/drivers/dri/s3v/s3v_state.c')
-rw-r--r--src/mesa/drivers/dri/s3v/s3v_state.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/mesa/drivers/dri/s3v/s3v_state.c b/src/mesa/drivers/dri/s3v/s3v_state.c
index 66f15dbbbd..f92859d4ed 100644
--- a/src/mesa/drivers/dri/s3v/s3v_state.c
+++ b/src/mesa/drivers/dri/s3v/s3v_state.c
@@ -51,7 +51,7 @@ static void s3vUpdateAlphaMode( GLcontext *ctx )
}
-static void s3vDDAlphaFunc( GLcontext *ctx, GLenum func, GLchan ref )
+static void s3vDDAlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref )
{
s3vContextPtr vmesa = S3V_CONTEXT(ctx);
@@ -492,7 +492,7 @@ static void s3vDDColorMask( GLcontext *ctx, GLboolean r, GLboolean g,
* Miscellaneous
*/
-static void s3vDDClearColor( GLcontext *ctx, const GLchan color[4])
+static void s3vDDClearColor( GLcontext *ctx, const GLfloat color[4])
{
s3vContextPtr vmesa = S3V_CONTEXT(ctx);
@@ -842,14 +842,17 @@ void s3vInitStateFuncs( GLcontext *ctx )
ctx->Driver.Clear = s3vDDClear;
ctx->Driver.ClearIndex = NULL;
ctx->Driver.ClearColor = s3vDDClearColor;
- ctx->Driver.SetDrawBuffer = s3vDDSetDrawBuffer;
+ ctx->Driver.DrawBuffer = s3vDDSetDrawBuffer;
+ ctx->Driver.ReadBuffer = NULL; /* XXX */
ctx->Driver.IndexMask = NULL;
ctx->Driver.ColorMask = NULL; /* s3vDDColorMask; */ /* FIXME */
ctx->Driver.AlphaFunc = s3vDDAlphaFunc; /* FIXME */
+#if 0
ctx->Driver.BlendEquation = NULL; /* s3vDDBlendEquation; */
ctx->Driver.BlendFunc = s3vDDBlendFunc; /* FIXME */
+#endif
ctx->Driver.BlendFuncSeparate = NULL; /* s3vDDBlendFuncSeparate; */
ctx->Driver.ClearDepth = s3vDDClearDepth;
ctx->Driver.CullFace = s3vDDCullFace;