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

update some tests for visual bit depths to use renderbuffers

Browse Source
This commit is contained in:
Brian Paul
2006-04-25 22:55:19 +00:00
parent 2486267dda
commit 9c4fd26bca
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/swrast/s_buffers.c
+4 -3
View File
@@ -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;
}
src/mesa/swrast/s_triangle.c
+2 -2
View File
@@ -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);
}