diff options
| author | Jason Ekstrand <[email protected]> | 2015-12-10 16:58:24 -0800 |
|---|---|---|
| committer | Jason Ekstrand <[email protected]> | 2015-12-10 18:29:36 -0800 |
| commit | d5c9955d3eaa7311e2b2350b6964bae516c7b7b2 (patch) | |
| tree | 401e4378dd9909f9010f076d026a77e515170be5 /src/glsl/ir_constant_expression.cpp | |
| parent | 8beea9d45b5879ea3dbd9c0e48f0c0eb2451f380 (diff) | |
| parent | 78b81be627734ea7fa50ea246c07b0d4a3a1638a (diff) | |
Merge remote-tracking branch 'mesa-public/master' into vulkan
This pulls in nir_intrinsic_load/store changes and the switch of all
uniforms in i965 to bytes. This accounts for the Vulkan changes.
Diffstat (limited to 'src/glsl/ir_constant_expression.cpp')
| -rw-r--r-- | src/glsl/ir_constant_expression.cpp | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/src/glsl/ir_constant_expression.cpp b/src/glsl/ir_constant_expression.cpp index 67ed3605a8c..ef705851613 100644 --- a/src/glsl/ir_constant_expression.cpp +++ b/src/glsl/ir_constant_expression.cpp @@ -41,14 +41,6 @@ #include "glsl_types.h" #include "program/hash_table.h" -#if defined(__SUNPRO_CC) && !defined(isnormal) -#include <ieeefp.h> -static int isnormal(double x) -{ - return fpclass(x) == FP_NORMAL; -} -#endif - static float dot_f(ir_constant *op0, ir_constant *op1) { |