diff options
| author | Brian Paul <[email protected]> | 2005-07-01 01:22:25 +0000 |
|---|---|---|
| committer | Brian Paul <[email protected]> | 2005-07-01 01:22:25 +0000 |
| commit | bb5c84fcbc22b4fef28cf4589d6410eb3c35a496 (patch) | |
| tree | b193c36240300d9d417c0af1c14939c24baed194 /src/mesa/main | |
| parent | 446e25894099ed8e1c7034d812ca4baf30a84a56 (diff) | |
Remove NEW_RENDERBUFFER stuff.
Now, OLD_RENDERBUFFER marks code that needs to eventually be removed when
all the drivers are updated to no longer need the SetBuffer() function.
Diffstat (limited to 'src/mesa/main')
| -rw-r--r-- | src/mesa/main/config.h | 5 | ||||
| -rw-r--r-- | src/mesa/main/context.c | 6 | ||||
| -rw-r--r-- | src/mesa/main/mtypes.h | 2 |
3 files changed, 4 insertions, 9 deletions
diff --git a/src/mesa/main/config.h b/src/mesa/main/config.h index 476ed63aadc..719c68e3000 100644 --- a/src/mesa/main/config.h +++ b/src/mesa/main/config.h @@ -322,9 +322,8 @@ #define MAX_CLIPPED_VERTICES ((2 * (6 + MAX_CLIP_PLANES))+1) -/* XXX these are temporary */ -#define NEW_RENDERBUFFER 1 -#define OLD_RENDERBUFFER 0 +/* XXX everything marked with OLD_RENDERBUFFER will be going away... */ +#define OLD_RENDERBUFFER 1 #endif /* CONFIG_H */ diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 2c444c80d8a..ba8a456248c 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1555,7 +1555,6 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, if (drawBuffer && readBuffer) { /* TODO: check if newCtx and buffer's visual match??? */ -#if NEW_RENDERBUFFER ASSERT(drawBuffer->Name == 0); ASSERT(readBuffer->Name == 0); newCtx->WinSysDrawBuffer = drawBuffer; @@ -1565,10 +1564,7 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer, newCtx->DrawBuffer = drawBuffer; newCtx->ReadBuffer = readBuffer; } -#else - newCtx->DrawBuffer = drawBuffer; - newCtx->ReadBuffer = readBuffer; -#endif + newCtx->NewState |= _NEW_BUFFERS; #if _HAVE_FULL_GL diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index 1733c43bce0..655e30336af 100644 --- a/src/mesa/main/mtypes.h +++ b/src/mesa/main/mtypes.h @@ -2184,7 +2184,7 @@ struct gl_framebuffer struct gl_renderbuffer *_ColorDrawBuffers[MAX_DRAW_BUFFERS][4]; struct gl_renderbuffer *_ColorReadBuffer; -#if OLD_RENDERBUFFER || NEW_RENDERBUFFER +#if OLD_RENDERBUFFER /* XXX THIS IS TEMPORARY */ GLuint _ColorDrawBit[MAX_DRAW_BUFFERS][4]; #endif |