fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 09:28:07 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

compiler: use 64bit check for sizing instead of double check.

Browse source 
This just moves code to the new check in advance of int64 support.

Reviewed-by: Ilia Mirkin <imirkin@alum.mit.edu>
Signed-off-by: Dave Airlie <airlied@redhat.com>
This commit is contained in:
Dave Airlie 2016-06-09 07:07:06 +10:00
parent 246518154e
commit a82b8e8b36
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/compiler/glsl_types.cpp
View file

@ -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":
*