diff options
| author | Dave Airlie <[email protected]> | 2016-06-09 07:07:06 +1000 |
|---|---|---|
| committer | Dave Airlie <[email protected]> | 2016-06-09 07:37:15 +1000 |
| commit | a82b8e8b36cdaf8fd95a38b8df4215bead0e3ae7 (patch) | |
| tree | 8a5b45e6c4e71cb39f9af82b6f177595528b4d6b | |
| parent | 246518154efb5da5e3934385b9a43a1571209c60 (diff) | |
compiler: use 64bit check for sizing instead of double check.
This just moves code to the new check in advance of int64 support.
Reviewed-by: Ilia Mirkin <[email protected]>
Signed-off-by: Dave Airlie <[email protected]>
| -rw-r--r-- | src/compiler/glsl_types.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/compiler/glsl_types.cpp b/src/compiler/glsl_types.cpp index 11f1e85ec1c..884f3118e83 100644 --- a/src/compiler/glsl_types.cpp +++ b/src/compiler/glsl_types.cpp @@ -1434,7 +1434,7 @@ glsl_type::can_implicitly_convert_to(const glsl_type *desired, unsigned glsl_type::std140_base_alignment(bool row_major) const { - unsigned N = is_double() ? 8 : 4; + unsigned N = is_64bit() ? 8 : 4; /* (1) If the member is a scalar consuming <N> basic machine units, the * base alignment is <N>. @@ -1552,7 +1552,7 @@ glsl_type::std140_base_alignment(bool row_major) const unsigned glsl_type::std140_size(bool row_major) const { - unsigned N = is_double() ? 8 : 4; + unsigned N = is_64bit() ? 8 : 4; /* (1) If the member is a scalar consuming <N> basic machine units, the * base alignment is <N>. @@ -1689,7 +1689,7 @@ unsigned glsl_type::std430_base_alignment(bool row_major) const { - unsigned N = is_double() ? 8 : 4; + unsigned N = is_64bit() ? 8 : 4; /* (1) If the member is a scalar consuming <N> basic machine units, the * base alignment is <N>. @@ -1798,7 +1798,7 @@ glsl_type::std430_base_alignment(bool row_major) const unsigned glsl_type::std430_array_stride(bool row_major) const { - unsigned N = is_double() ? 8 : 4; + unsigned N = is_64bit() ? 8 : 4; /* Notice that the array stride of a vec3 is not 3 * N but 4 * N. * See OpenGL 4.30 spec, section 7.6.2.2 "Standard Uniform Block Layout" @@ -1816,7 +1816,7 @@ glsl_type::std430_array_stride(bool row_major) const unsigned glsl_type::std430_size(bool row_major) const { - unsigned N = is_double() ? 8 : 4; + unsigned N = is_64bit() ? 8 : 4; /* OpenGL 4.30 spec, section 7.6.2.2 "Standard Uniform Block Layout": * |