diff options
Diffstat (limited to 'src/mesa/drivers/dri/common')
| -rw-r--r-- | src/mesa/drivers/dri/common/texmem.c | 2 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/utils.c | 3 | ||||
| -rw-r--r-- | src/mesa/drivers/dri/common/vblank.h | 4 |
3 files changed, 7 insertions, 2 deletions
diff --git a/src/mesa/drivers/dri/common/texmem.c b/src/mesa/drivers/dri/common/texmem.c index a40d33f1e9d..c76d3716822 100644 --- a/src/mesa/drivers/dri/common/texmem.c +++ b/src/mesa/drivers/dri/common/texmem.c @@ -1083,7 +1083,7 @@ driValidateTextureHeaps( driTexHeap * const * texture_heaps, * the correct heap. * * Check the texobj base address corresponds to the MemBlock - * range. Check the texobj size (recalculate???) fits within + * range. Check the texobj size (recalculate?) fits within * the MemBlock. * * Count the number of texobj's using this heap. diff --git a/src/mesa/drivers/dri/common/utils.c b/src/mesa/drivers/dri/common/utils.c index 81429c167e3..d337cb6b948 100644 --- a/src/mesa/drivers/dri/common/utils.c +++ b/src/mesa/drivers/dri/common/utils.c @@ -46,7 +46,8 @@ driParseDebugString( const char * debug, flag = 0; if ( debug != NULL ) { while( control->string != NULL ) { - if ( strstr( debug, control->string ) != NULL ) { + if ( !strcmp( debug, "all" ) || + strstr( debug, control->string ) != NULL ) { flag |= control->flag; } diff --git a/src/mesa/drivers/dri/common/vblank.h b/src/mesa/drivers/dri/common/vblank.h index 718ecd7b1f3..3dc965def1a 100644 --- a/src/mesa/drivers/dri/common/vblank.h +++ b/src/mesa/drivers/dri/common/vblank.h @@ -55,6 +55,10 @@ extern int driWaitForVBlank( const __DRIdrawablePrivate *priv, #include <unistd.h> /* for usleep() */ #include <sched.h> /* for sched_yield() */ +#ifdef linux +#include <sched.h> /* for sched_yield() */ +#endif + #define DO_USLEEP(nr) \ do { \ if (0) fprintf(stderr, "%s: usleep for %u\n", __FUNCTION__, nr ); \ |