fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-23 19:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

mesa: Trivial coding standards cleanups

Browse source 
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Dylan Baker <baker.dylan.c@gmail.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
This commit is contained in:
Ian Romanick 2015-04-28 11:26:33 -07:00
parent 5a845cf898
commit 1ec6523fcf
1 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/mesa/main/version.c
View file

@ -35,20 +35,13 @@
static bool static bool
check_for_ending(const char *string, const char *ending) check_for_ending(const char *string, const char *ending)
{ {
int len1, len2; const size_t len1 = strlen(string);
const size_t len2 = strlen(ending);
len1 = strlen(string); if (len2 > len1)
len2 = strlen(ending);
if (len2 > len1) {
return false; return false;
}
if (strcmp(string + (len1 - len2), ending) == 0) { return strcmp(string + (len1 - len2), ending) == 0;
return true;
} else {
return false;
}
} }
/** /**
@ -77,12 +70,14 @@ get_gl_override(int *version, bool *fwd_context, bool *compat_context)
n = sscanf(version_str, "%u.%u", &major, &minor); n = sscanf(version_str, "%u.%u", &major, &minor);
if (n != 2) { if (n != 2) {
fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version_str); fprintf(stderr, "error: invalid value for %s: %s\n",
env_var, version_str);
override_version = 0; override_version = 0;
} else { } else {
override_version = major * 10 + minor; override_version = major * 10 + minor;
if (override_version < 30 && fc_suffix) { if (override_version < 30 && fc_suffix) {
fprintf(stderr, "error: invalid value for %s: %s\n", env_var, version_str); fprintf(stderr, "error: invalid value for %s: %s\n",
env_var, version_str);
} }
} }
} }
@ -301,7 +296,7 @@ compute_version(const struct gl_extensions *extensions,
extensions->ARB_gpu_shader5 && extensions->ARB_gpu_shader5 &&
extensions->ARB_gpu_shader_fp64 && extensions->ARB_gpu_shader_fp64 &&
extensions->ARB_sample_shading && extensions->ARB_sample_shading &&
0/*extensions->ARB_shader_subroutine*/ && false /*extensions->ARB_shader_subroutine*/ &&
extensions->ARB_tessellation_shader && extensions->ARB_tessellation_shader &&
extensions->ARB_texture_buffer_object_rgb32 && extensions->ARB_texture_buffer_object_rgb32 &&
extensions->ARB_texture_cube_map_array && extensions->ARB_texture_cube_map_array &&
@ -312,7 +307,7 @@ compute_version(const struct gl_extensions *extensions,
consts->GLSLVersion >= 410 && consts->GLSLVersion >= 410 &&
extensions->ARB_ES2_compatibility && extensions->ARB_ES2_compatibility &&
extensions->ARB_shader_precision && extensions->ARB_shader_precision &&
0/*extensions->ARB_vertex_attrib_64bit*/ && false /*extensions->ARB_vertex_attrib_64bit*/ &&
extensions->ARB_viewport_array); extensions->ARB_viewport_array);
const bool ver_4_2 = (ver_4_1 && const bool ver_4_2 = (ver_4_1 &&
consts->GLSLVersion >= 420 && consts->GLSLVersion >= 420 &&