Re: [Mesa-dev] [PATCH 03/20] SQUASH! whitespace fixes after previous commit

[Erik Faye-Lund]

On Thu, Apr 30, 2015 at 1:25 AM, Ian Romanick  wrote:
> From: Ian Romanick 
>
> Signed-off-by: Ian Romanick 

The title on this one doesn't seem quite right ("after previous"
should probably be "before next"), but that probably doesn't matter
because it will get squashed anyway...
___
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-dev

[Mesa-dev] [PATCH 03/20] SQUASH! whitespace fixes after previous commit

[Ian Romanick]

From: Ian Romanick 

Signed-off-by: Ian Romanick 
---
 src/mesa/main/version.c | 261 
 1 file changed, 130 insertions(+), 131 deletions(-)

diff --git a/src/mesa/main/version.c b/src/mesa/main/version.c
index 7bf3f49..85d5ab1 100644
--- a/src/mesa/main/version.c
+++ b/src/mesa/main/version.c
@@ -58,8 +58,7 @@ check_for_ending(const char *string, const char *ending)
  * fwd_context is only valid if version > 0
  */
 static void
-get_gl_override(int *version, bool *fwd_context,
-bool *compat_context)
+get_gl_override(int *version, bool *fwd_context, bool *compat_context)
 {
const char *env_var = "MESA_GL_VERSION_OVERRIDE";
const char *version_str;
@@ -212,120 +211,120 @@ compute_version(const struct gl_extensions *extensions,
GLuint major, minor, version;
 
const bool ver_1_3 = (extensions->ARB_texture_border_clamp &&
-  extensions->ARB_texture_cube_map &&
-  extensions->ARB_texture_env_combine &&
-  extensions->ARB_texture_env_dot3);
+ extensions->ARB_texture_cube_map &&
+ extensions->ARB_texture_env_combine &&
+ extensions->ARB_texture_env_dot3);
const bool ver_1_4 = (ver_1_3 &&
-  extensions->ARB_depth_texture &&
-  extensions->ARB_shadow &&
-  extensions->ARB_texture_env_crossbar &&
-  extensions->EXT_blend_color &&
-  extensions->EXT_blend_func_separate &&
-  extensions->EXT_blend_minmax &&
-  extensions->EXT_point_parameters);
+ extensions->ARB_depth_texture &&
+ extensions->ARB_shadow &&
+ extensions->ARB_texture_env_crossbar &&
+ extensions->EXT_blend_color &&
+ extensions->EXT_blend_func_separate &&
+ extensions->EXT_blend_minmax &&
+ extensions->EXT_point_parameters);
const bool ver_1_5 = (ver_1_4 &&
-  extensions->ARB_occlusion_query);
+ extensions->ARB_occlusion_query);
const bool ver_2_0 = (ver_1_5 &&
-  extensions->ARB_point_sprite &&
-  extensions->ARB_vertex_shader &&
-  extensions->ARB_fragment_shader &&
-  extensions->ARB_texture_non_power_of_two &&
-  extensions->EXT_blend_equation_separate &&
-
- /* Technically, 2.0 requires the functionality
-  * of the EXT version.  Enable 2.0 if either
-  * extension is available, and assume that a
-  * driver that only exposes the ATI extension
-  * will fallback to software when necessary.
-  */
- (extensions->EXT_stencil_two_side
-  || extensions->ATI_separate_stencil));
+ extensions->ARB_point_sprite &&
+ extensions->ARB_vertex_shader &&
+ extensions->ARB_fragment_shader &&
+ extensions->ARB_texture_non_power_of_two &&
+ extensions->EXT_blend_equation_separate &&
+
+ /* Technically, 2.0 requires the functionality of the
+  * EXT version.  Enable 2.0 if either extension is
+  * available, and assume that a driver that only
+  * exposes the ATI extension will fallback to
+  * software when necessary.
+  */
+ (extensions->EXT_stencil_two_side
+  || extensions->ATI_separate_stencil));
const bool ver_2_1 = (ver_2_0 &&
-  extensions->EXT_pixel_buffer_object &&
-  extensions->EXT_texture_sRGB);
+ extensions->EXT_pixel_buffer_object &&
+ extensions->EXT_texture_sRGB);
const bool ver_3_0 = (ver_2_1 &&
-  consts->GLSLVersion >= 130 &&
-  (consts->MaxSamples >= 4 || consts->FakeSWMSAA) 
&&
-  (api == API_OPENGL_CORE ||
-   extensions->ARB_color_buffer_float) &&
-  extensions->ARB_depth_buffer_float &&
-  extensions->ARB_half_float_vertex &&
-  extensions->ARB_map_buffer_range &&
-  extensions->ARB_shader_texture_lod