diff options
| author | Brian Paul <[email protected]> | 2002-07-09 01:22:50 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2002-07-09 01:22:50 +0000 |
| commit | 3b4fbbc129c711a5aec8d653d5c6eb2e195f947c (patch) | |
| tree | ececa2d3a08ab45afd2068d9cabf5609a0c374d1 /src/mesa/main/context.c | |
| parent | b4338e58879a4f2eabf8af09f9dfa7adf6e9f9f2 (diff) | |
Overhaul of glRead/DrawBuffer() code. Now, swrast->Driver.SetBuffer()
indicates the read AND draw color buffer for all software rasterization.
Lots of related clean-ups. See RELNOTES-4.1 for details.
Diffstat (limited to 'src/mesa/main/context.c')
| -rw-r--r-- | src/mesa/main/context.c | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 9a141d9db20..7fa32c601c0 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1,4 +1,4 @@ -/* $Id: context.c,v 1.174 2002/06/29 19:48:15 brianp Exp $ */ +/* $Id: context.c,v 1.175 2002/07/09 01:22:50 brianp Exp $ */ /* * Mesa 3-D graphics library @@ -978,7 +978,6 @@ init_attrib_groups( GLcontext *ctx ) ctx->Color.ColorLogicOpEnabled = GL_FALSE; ctx->Color.LogicOp = GL_COPY; ctx->Color.DitherFlag = GL_TRUE; - ctx->Color.MultiDrawBuffer = GL_FALSE; /* Current group */ ASSIGN_4V( ctx->Current.Attrib[VERT_ATTRIB_WEIGHT], 0.0, 0.0, 0.0, 0.0 ); @@ -1689,17 +1688,17 @@ _mesa_initialize_context( GLcontext *ctx, if (visual->doubleBufferMode) { ctx->Color.DrawBuffer = GL_BACK; - ctx->Color.DriverDrawBuffer = GL_BACK_LEFT; - ctx->Color.DrawDestMask = BACK_LEFT_BIT; + ctx->Color._DriverDrawBuffer = GL_BACK_LEFT; + ctx->Color._DrawDestMask = BACK_LEFT_BIT; ctx->Pixel.ReadBuffer = GL_BACK; - ctx->Pixel.DriverReadBuffer = GL_BACK_LEFT; + ctx->Pixel._DriverReadBuffer = GL_BACK_LEFT; } else { ctx->Color.DrawBuffer = GL_FRONT; - ctx->Color.DriverDrawBuffer = GL_FRONT_LEFT; - ctx->Color.DrawDestMask = FRONT_LEFT_BIT; + ctx->Color._DriverDrawBuffer = GL_FRONT_LEFT; + ctx->Color._DrawDestMask = FRONT_LEFT_BIT; ctx->Pixel.ReadBuffer = GL_FRONT; - ctx->Pixel.DriverReadBuffer = GL_FRONT_LEFT; + ctx->Pixel._DriverReadBuffer = GL_FRONT_LEFT; } if (!alloc_proxy_textures(ctx)) { @@ -1716,6 +1715,8 @@ _mesa_initialize_context( GLcontext *ctx, _glapi_add_entrypoint("glCompressedTexSubImage2DARB", 558); _glapi_add_entrypoint("glCompressedTexSubImage1DARB", 559); _glapi_add_entrypoint("glGetCompressedTexImageARB", 560); + /* XXX we should add a bunch of new functions here */ + /* Find the larger of Mesa's dispatch table and libGL's dispatch table. * In practice, this'll be the same for stand-alone Mesa. But for DRI |