summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brian.paul@tungstengraphics.com>2006-04-25 22:55:19 +0000
committerBrian Paul <brian.paul@tungstengraphics.com>2006-04-25 22:55:19 +0000
commit9c4fd26bcab7e4a5bd97a56deff89b8ea0ae5f1d (patch)
tree94abae129c42a19631325572ab53e066e74fb6d4
parent2486267dda524b612879386aa5cea2bef98602ff (diff)
update some tests for visual bit depths to use renderbuffers
-rw-r--r--src/mesa/swrast/s_buffers.c7
-rw-r--r--src/mesa/swrast/s_triangle.c4
2 files changed, 6 insertions, 5 deletions
diff --git a/src/mesa/swrast/s_buffers.c b/src/mesa/swrast/s_buffers.c
index 9dace65860..57f23ee829 100644
--- a/src/mesa/swrast/s_buffers.c
+++ b/src/mesa/swrast/s_buffers.c
@@ -169,8 +169,8 @@ clear_ci_buffer(GLcontext *ctx, struct gl_renderbuffer *rb)
ASSERT(!ctx->Visual.rgbMode);
- ASSERT((ctx->Color.IndexMask & ((1 << ctx->Visual.indexBits) - 1))
- == (GLuint) ((1 << ctx->Visual.indexBits) - 1));
+ ASSERT((ctx->Color.IndexMask & ((1 << rb->IndexBits) - 1))
+ == (GLuint) ((1 << rb->IndexBits) - 1));
ASSERT(rb->PutMonoRow);
@@ -221,7 +221,8 @@ clear_color_buffers(GLcontext *ctx)
}
}
else {
- const GLuint indexBits = (1 << ctx->Visual.indexBits) - 1;
+ struct gl_renderbuffer *rb = ctx->DrawBuffer->_ColorDrawBuffers[0][0];
+ const GLuint indexBits = (1 << rb->IndexBits) - 1;
if ((ctx->Color.IndexMask & indexBits) == indexBits) {
masking = GL_FALSE;
}
diff --git a/src/mesa/swrast/s_triangle.c b/src/mesa/swrast/s_triangle.c
index f270372345..a1cbd881a7 100644
--- a/src/mesa/swrast/s_triangle.c
+++ b/src/mesa/swrast/s_triangle.c
@@ -914,7 +914,7 @@ fast_persp_span(GLcontext *ctx, struct sw_span *span,
return; \
}
#define RENDER_SPAN( span ) \
- if (ctx->Visual.depthBits <= 16) { \
+ if (rb->DepthBits <= 16) { \
GLuint i; \
const GLushort *zRow = (const GLushort *) \
rb->GetPointer(ctx, rb, span.x, span.y); \
@@ -1110,7 +1110,7 @@ _swrast_choose_triangle( GLcontext *ctx )
&& ctx->Depth.Mask == GL_TRUE)
|| swrast->_RasterMask == TEXTURE_BIT)
&& ctx->Polygon.StippleFlag == GL_FALSE
- && ctx->Visual.depthBits <= 16) {
+ && ctx->DrawBuffer->Visual.depthBits <= 16) {
if (swrast->_RasterMask == (DEPTH_BIT | TEXTURE_BIT)) {
USE(simple_z_textured_triangle);
}