diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:44:21 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2015-11-22 02:44:21 +0000 |
| commit | 23c5ef70e9b6af56ec1311a362ca9868adce6f30 (patch) | |
| tree | 2a7d1cf0240924b79d865e4a26d4fc29c355f42a /lib/mesa/src/gallium | |
| parent | 215111410bf35e60399efcc29a1c70969bc6332f (diff) | |
import Mesa 11.0.6
Diffstat (limited to 'lib/mesa/src/gallium')
| -rw-r--r-- | lib/mesa/src/gallium/drivers/r300/compiler/radeon_emulate_branches.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/mesa/src/gallium/drivers/r300/compiler/radeon_emulate_branches.c b/lib/mesa/src/gallium/drivers/r300/compiler/radeon_emulate_branches.c index eab0d7e9d..7bede344f 100644 --- a/lib/mesa/src/gallium/drivers/r300/compiler/radeon_emulate_branches.c +++ b/lib/mesa/src/gallium/drivers/r300/compiler/radeon_emulate_branches.c @@ -112,7 +112,7 @@ static struct proxy_info * get_proxy_info(struct state_and_proxies * sap, if (file == RC_FILE_TEMPORARY) { return &sap->Proxies->Temporary[index]; } else { - return NULL; + return 0; } } |