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

mesa: pass 'mask', not NULL to renderbuffer->Put functions

Browse Source 
Fixes bug 17800.
This commit is contained in:
Brian Paul
2008-10-07 16:52:47 -06:00
parent 4f4147eadd
commit 7cb723a3fd
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mesa/swrast/s_depth.c
+10 -10
View File
@@ -1,8 +1,8 @@
/*
* Mesa 3-D graphics library
* Version: 6.5.1
* Version: 7.2.1
*
* Copyright (C) 1999-2006 Brian Paul All Rights Reserved.
* Copyright (C) 1999-2008 Brian Paul All Rights Reserved.
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@@ -534,15 +534,15 @@ depth_test_span( GLcontext *ctx, SWspan *span)
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
rb->GetRow(ctx, rb, count, x, y, zbuffer);
passed = depth_test_span16(ctx, count, zbuffer, zValues, mask );
rb->PutRow(ctx, rb, count, x, y, zbuffer, NULL);
passed = depth_test_span16(ctx, count, zbuffer, zValues, mask);
rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
rb->GetRow(ctx, rb, count, x, y, zbuffer);
passed = depth_test_span32(ctx, count, zbuffer, zValues, mask );
rb->PutRow(ctx, rb, count, x, y, zbuffer, NULL);
passed = depth_test_span32(ctx, count, zbuffer, zValues, mask);
rb->PutRow(ctx, rb, count, x, y, zbuffer, mask);
}
}
@@ -1080,15 +1080,15 @@ depth_test_pixels( GLcontext *ctx, SWspan *span )
if (rb->DataType == GL_UNSIGNED_SHORT) {
GLushort zbuffer[MAX_WIDTH];
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLushort));
depth_test_span16(ctx, count, zbuffer, z, mask );
rb->PutValues(ctx, rb, count, x, y, zbuffer, NULL);
depth_test_span16(ctx, count, zbuffer, z, mask);
rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);
}
else {
GLuint zbuffer[MAX_WIDTH];
ASSERT(rb->DataType == GL_UNSIGNED_INT);
_swrast_get_values(ctx, rb, count, x, y, zbuffer, sizeof(GLuint));
depth_test_span32(ctx, count, zbuffer, z, mask );
rb->PutValues(ctx, rb, count, x, y, zbuffer, NULL);
depth_test_span32(ctx, count, zbuffer, z, mask);
rb->PutValues(ctx, rb, count, x, y, zbuffer, mask);
}
}