Re: [Mesa-dev] Assertion `key->nr_vertex_elements <= llvm->draw->pt.nr_vertex_elements' failed.

2014-10-18 Thread Thomas Sondergaard
On 2014-10-14 22:37, Roland Scheidegger wrote: On 10/14/2014 01:14 PM, Thomas Sondergaard wrote: using llvmpipe I'm hitting the following assertion in some old code that use glEdgeFlag(). src/gallium/auxiliary/draw/draw_llvm.c:1824:draw_llvm_make_variant_key: Assertion `key->nr_vertex_

[Mesa-dev] Assertion `key->nr_vertex_elements <= llvm->draw->pt.nr_vertex_elements' failed.

2014-10-14 Thread Thomas Sondergaard
using llvmpipe I'm hitting the following assertion in some old code that use glEdgeFlag(). src/gallium/auxiliary/draw/draw_llvm.c:1824:draw_llvm_make_variant_key: Assertion `key->nr_vertex_elements <= llvm->draw->pt.nr_vertex_elements' failed. I have captured a trace with apitrace from the p

Re: [Mesa-dev] [PATCH 3/4] MSVC2013: Work around internal compiler error

2014-01-08 Thread Thomas Sondergaard
On 08-01-2014 00:11, Brian Paul wrote: On 01/07/2014 03:30 PM, Ian Romanick wrote: On 01/07/2014 02:22 PM, Thomas Sondergaard wrote: On 2014-01-07 23:05, Ian Romanick wrote: On 01/07/2014 12:31 PM, Thomas Sondergaard wrote: This small rearrangement avoids MSVC 2013 ICE. Also, this should be

Re: [Mesa-dev] [PATCH 3/4] MSVC2013: Work around internal compiler error

2014-01-07 Thread Thomas Sondergaard
On 2014-01-07 23:05, Ian Romanick wrote: On 01/07/2014 12:31 PM, Thomas Sondergaard wrote: This small rearrangement avoids MSVC 2013 ICE. Also, this should be a better memory access order. Can you explain this better? As far as I can tell, this just changes the order the indices are visited

[Mesa-dev] [PATCH 1/4] MSVC 2013: Preliminary support for MSVC_VERSION=12.0

2014-01-07 Thread Thomas Sondergaard
--- common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.py b/common.py index 1d618e6..22c1725 100644 --- a/common.py +++ b/common.py @@ -100,4 +100,4 @@ def AddOptions(opts): opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes')) opts.Add

[Mesa-dev] [PATCH 3/4] MSVC2013: Work around internal compiler error

2014-01-07 Thread Thomas Sondergaard
This small rearrangement avoids MSVC 2013 ICE. Also, this should be a better memory access order. --- src/gallium/drivers/softpipe/sp_quad_blend.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/sp

[Mesa-dev] [PATCH 2/4] MSVC2013: Fix compile error with MSVC 2013

2014-01-07 Thread Thomas Sondergaard
This fixes the following compile error: src\glsl\ir_constant_expression.cpp(1405) : error C2666: 'copysign' : 3 overloads have similar conversions --- src/glsl/ir_constant_expression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/ir_constant_expression.cpp b/src

[Mesa-dev] [PATCH 4/4] MSVC2013: Namespace qualify fma to override ambiguity with fma from math.h

2014-01-07 Thread Thomas Sondergaard
MSVC 2013 version of math.h includes an fma() function. --- src/glsl/builtin_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 10127f3..b3e407a 100644 --- a/src/glsl/builtin_functions.cpp +++ b/sr

Re: [Mesa-dev] [PATCH 4/4] MSVC2013: Namespace qualify fma to override ambiguity with fma from math.h

2014-01-07 Thread Thomas Sondergaard
On 2014-01-07 23:45, Kenneth Graunke wrote: On 01/07/2014 12:31 PM, Thomas Sondergaard wrote: MSVC 2013 version of math.h includes an fma() function. --- src/glsl/builtin_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/builtin_functions.cpp b/src

Re: [Mesa-dev] [PATCH 1/4] MSVC 2013: Preliminary support for MSVC_VERSION=12.0

2014-01-07 Thread Thomas Sondergaard
On 2014-01-07 22:37, Brian Paul wrote: On 01/07/2014 01:31 PM, Thomas Sondergaard wrote: --- common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.py b/common.py index 1d618e6..22c1725 100644 --- a/common.py +++ b/common.py @@ -100,4 +100,4 @@ def AddOptions

[Mesa-dev] [PATCH 2/4] MSVC2013: Fix compile error with MSVC 2013

2014-01-07 Thread Thomas Sondergaard
This fixes the following compile error: src\glsl\ir_constant_expression.cpp(1405) : error C2666: 'copysign' : 3 overloads have similar conversions --- src/glsl/ir_constant_expression.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/ir_constant_expression.cpp b/src

[Mesa-dev] [PATCH 4/4] MSVC2013: Namespace qualify fma to override ambiguity with fma from math.h

2014-01-07 Thread Thomas Sondergaard
MSVC 2013 version of math.h includes an fma() function. --- src/glsl/builtin_functions.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 10127f3..b3e407a 100644 --- a/src/glsl/builtin_functions.cpp +++ b/sr

[Mesa-dev] [PATCH 3/4] MSVC2013: Work around internal compiler error

2014-01-07 Thread Thomas Sondergaard
This small rearrangement avoids MSVC 2013 ICE. Also, this should be a better memory access order. --- src/gallium/drivers/softpipe/sp_quad_blend.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/gallium/drivers/softpipe/sp_quad_blend.c b/src/gallium/drivers/softpipe/

[Mesa-dev] [PATCH 1/4] MSVC 2013: Preliminary support for MSVC_VERSION=12.0

2014-01-07 Thread Thomas Sondergaard
--- common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.py b/common.py index 1d618e6..22c1725 100644 --- a/common.py +++ b/common.py @@ -100,4 +100,4 @@ def AddOptions(opts): opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes')) opts.Add

[Mesa-dev] [PATCH 1/4] MSVC 2013: Preliminary support for MSVC_VERSION=12.0

2014-01-07 Thread Thomas Sondergaard
--- common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common.py b/common.py index 1d618e6..22c1725 100644 --- a/common.py +++ b/common.py @@ -100,4 +100,4 @@ def AddOptions(opts): opts.Add(BoolOption('quiet', 'DEPRECATED: profile build', 'yes')) opts.Add(Bool