Merge remote branch 'origin/master' into lp-setup-llvm

Conflicts:
	src/gallium/drivers/llvmpipe/lp_setup_coef.c
	src/gallium/drivers/llvmpipe/lp_setup_coef.h
	src/gallium/drivers/llvmpipe/lp_setup_coef_intrin.c
	src/gallium/drivers/llvmpipe/lp_setup_point.c
	src/gallium/drivers/llvmpipe/lp_setup_tri.c
	src/gallium/drivers/llvmpipe/lp_state_derived.c
	src/gallium/drivers/llvmpipe/lp_state_fs.h

2 files changed, 30 insertions, 0 deletions

diff --git a/src/glsl/builtins/profiles/130.frag b/src/glsl/builtins/profiles/130.frag
index aa7a6adb1d..96440703bd 100644
--- a/src/glsl/builtins/profiles/130.frag
+++ b/src/glsl/builtins/profiles/130.frag
@@ -143,6 +143,21 @@ vec2  floor(vec2  x);
 vec3  floor(vec3  x);
 vec4  floor(vec4  x);
 
+float trunc(float x);
+vec2  trunc(vec2  x);
+vec3  trunc(vec3  x);
+vec4  trunc(vec4  x);
+
+float round(float x);
+vec2  round(vec2  x);
+vec3  round(vec3  x);
+vec4  round(vec4  x);
+
+float roundEven(float x);
+vec2  roundEven(vec2  x);
+vec3  roundEven(vec3  x);
+vec4  roundEven(vec4  x);
+
 float ceil(float x);
 vec2  ceil(vec2  x);
 vec3  ceil(vec3  x);
diff --git a/src/glsl/builtins/profiles/130.vert b/src/glsl/builtins/profiles/130.vert
index d0152b0374..eb765186fc 100644
--- a/src/glsl/builtins/profiles/130.vert
+++ b/src/glsl/builtins/profiles/130.vert
@@ -143,6 +143,21 @@ vec2  floor(vec2  x);
 vec3  floor(vec3  x);
 vec4  floor(vec4  x);
 
+float trunc(float x);
+vec2  trunc(vec2  x);
+vec3  trunc(vec3  x);
+vec4  trunc(vec4  x);
+
+float round(float x);
+vec2  round(vec2  x);
+vec3  round(vec3  x);
+vec4  round(vec4  x);
+
+float roundEven(float x);
+vec2  roundEven(vec2  x);
+vec3  roundEven(vec3  x);
+vec4  roundEven(vec4  x);
+
 float ceil(float x);
 vec2  ceil(vec2  x);
 vec3  ceil(vec3  x);