KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa: move depth/stencil buffer validation to swrast 

Since gl_framebuffer::_DepthBuffer and _StencilBuffer are only used
by swrast, do the validation of those fields in swrast too.
The main/depthstencil.[ch] code is no longer used and will be removed
next.

Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Brian Paul 2011-12-10 11:44:43 -07:00
parent 2ac02ea29f
commit 6e1228976b
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/mesa/main/framebuffer.c
View File

@ -34,7 +34,6 @@
#include "imports.h"
#include "buffers.h"
#include "context.h"
#include "depthstencil.h"
#include "enums.h"
#include "formats.h"
#include "macros.h"
@ -738,8 +737,6 @@ update_framebuffer(struct gl_context *ctx, struct gl_framebuffer *fb)
*/
update_color_draw_buffers(ctx, fb);
update_color_read_buffer(ctx, fb);
_mesa_update_depth_buffer(ctx, fb);
_mesa_update_stencil_buffer(ctx, fb);
compute_depth_max(fb);
}

23
src/mesa/swrast/s_context.c
View File

@ -36,6 +36,7 @@
#include "swrast.h"
#include "s_blend.h"
#include "s_context.h"
#include "s_depthstencil.h"
#include "s_lines.h"
#include "s_points.h"
#include "s_span.h"
@ -545,6 +546,25 @@ _swrast_update_active_attribs(struct gl_context *ctx)
}
/**
* Update the depth/stencil renderbuffers, if needed.
*/
static void
_swrast_update_depth_stencil(struct gl_context *ctx)
{
struct gl_framebuffer *drawFb = ctx->DrawBuffer;
struct gl_framebuffer *readFb = ctx->ReadBuffer;
_swrast_update_depth_buffer(ctx, drawFb);
_swrast_update_stencil_buffer(ctx, drawFb);
if (readFb != drawFb) {
_swrast_update_depth_buffer(ctx, readFb);
_swrast_update_stencil_buffer(ctx, readFb);
}
}
void
_swrast_validate_derived( struct gl_context *ctx )
{
@ -589,6 +609,9 @@ _swrast_validate_derived( struct gl_context *ctx )
_NEW_TEXTURE))
_swrast_update_specular_vertex_add(ctx);
if (swrast->NewState & _NEW_BUFFERS)
_swrast_update_depth_stencil(ctx);
swrast->NewState = 0;
swrast->StateChanges = 0;
swrast->InvalidateState = _swrast_invalidate_state;