summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/version.c
diff options
context:
space:
mode:
authorMartin Peres <martin.peres@linux.intel.com>2015-06-05 15:03:19 +0300
committerMartin Peres <martin.peres@linux.intel.com>2015-06-08 12:37:42 +0300
commit184e4de3a126fa21945fe59f68b8a29977919fc4 (patch)
treeb351e1f6afbcfe1e5f2132009e9339ba352d4248 /src/mesa/main/version.c
parent56e38edc960bf08213cdb0282838ccec3e5ea10e (diff)
downloadexternal_mesa3d-184e4de3a126fa21945fe59f68b8a29977919fc4.zip
external_mesa3d-184e4de3a126fa21945fe59f68b8a29977919fc4.tar.gz
external_mesa3d-184e4de3a126fa21945fe59f68b8a29977919fc4.tar.bz2
main/version: make sure all the output variables get set in get_gl_override
This fixes 2 warnings in gcc 5.1. Reviewed-by: Brian Paul <brianp@vmware.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Signed-off-by: Martin Peres <martin.peres@linux.intel.com>
Diffstat (limited to 'src/mesa/main/version.c')
-rw-r--r--src/mesa/main/version.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 409e5ae..60c7604 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -63,7 +63,7 @@ get_gl_override(gl_api api, int *version, bool *fwd_context,
static bool compat_suffix = false;
if (api == API_OPENGLES)
- return;
+ goto exit;
if (override_version < 0) {
override_version = 0;
@@ -93,6 +93,7 @@ get_gl_override(gl_api api, int *version, bool *fwd_context,
}
}
+exit:
*version = override_version;
*fwd_context = fc_suffix;
*compat_context = compat_suffix;