[Mesa-dev] [PATCH V3 12/13] vbo: map indirect buffer and extract params if doing sw primitive restart

2013-11-09 Thread Chris Forbes
V2: Check for mapping failure (thanks Brian) V3: - Change error on mapping failure to OUT_OF_MEMORY (Brian) - Unconst; remove casting away of const. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/vbo/vbo_primitive_restart.c | 33 + 1 file changed

[Mesa-dev] [PATCH V3 13/13] i965: Enable ARB_draw_indirect (and ARB_multi_draw_indirect) on Gen7+

2013-11-09 Thread Chris Forbes
.. and mark them off on the extensions list as done. V2: Enable only if pipelined register writes work. V3: Also update relnotes Signed-off-by: Chris Forbes chr...@ijw.co.nz Reviewed-by: Ian Romanick ian.d.roman...@intel.com --- docs/GL3.txt | 4 ++-- docs

[Mesa-dev] [PATCH V3 04/13] mesa: Add binding point for indirect buffer

2013-11-09 Thread Chris Forbes
Based on part of Patch 2 of Christoph Bumiller's ARB_draw_indirect series. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/main/bufferobj.c| 14 ++ src/mesa/main/get.c | 4 src/mesa/main/get_hash_params.py | 2 ++ src/mesa/main/mtypes.h

[Mesa-dev] [PATCH V3 07/13] mesa: add is_indirect to _mesa_prim

2013-11-09 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/vbo/vbo.h| 3 ++- src/mesa/vbo/vbo_exec_array.c | 5 + 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mesa/vbo/vbo.h b/src/mesa/vbo/vbo.h index e1914c8..f58fa0b 100644 --- a/src/mesa/vbo/vbo.h +++ b/src

[Mesa-dev] [PATCH V3 00/13] ARB_draw_indirect for i965

2013-11-09 Thread Chris Forbes
This series adds support for ARB_draw_indirect and ARB_multi_draw_indirect on Gen7+. Big changes: - Get rid of overcomplicated state tracking for the indirect bo in i965. - Make primcount==0 produce GL_INVALID_VALUE in MultiDraw*Indirect - Small tidyups for clarity

[Mesa-dev] [PATCH V3 02/13] glapi: add plumbing for GL_ARB_draw_indirect and GL_ARB_multi_draw_indirect

2013-11-09 Thread Chris Forbes
Based on part of Patch 2 of Christoph Bumiller's ARB_draw_indirect series. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mapi/glapi/gen/ARB_draw_indirect.xml | 45 src/mapi/glapi/gen/Makefile.am | 1 + src/mapi/glapi/gen/gl_API.xml

[Mesa-dev] [PATCH V3 10/13] i965: pass indirect buffer to primitive restart check

2013-11-09 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_draw.c | 7 --- src/mesa/drivers/dri/i965/brw_draw.h | 3 ++- src/mesa/drivers/dri/i965/brw_primitive_restart.c | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git

[Mesa-dev] [PATCH V3 09/13] i965: implement indirect drawing for Gen7

2013-11-09 Thread Chris Forbes
in the first dword of the 3DPRIMITIVE command itself. V3: - Deduplicate the common part of both indexed and nonindexed indirect setup. - Just refer to the indirect bo out of the context directly. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_draw.c | 57

[Mesa-dev] [PATCH V3 07/13] mesa: add is_indirect to _mesa_prim

2013-11-09 Thread Chris Forbes
V3: Add missing cases Signed-off-by: Chris Forbes chr...@ijw.co.nz Reviewed-by: Paul Berry stereotype...@gmail.com --- src/mesa/vbo/vbo.h| 3 ++- src/mesa/vbo/vbo_exec_api.c | 1 + src/mesa/vbo/vbo_exec_array.c | 9 + src/mesa/vbo/vbo_save_api.c | 2 ++ 4 files changed

[Mesa-dev] [PATCH] glsl: fix missing breaks in equals(ir_texture, ..)

2013-11-09 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz Cc: 10.0 mesa-sta...@lists.freedesktop.org --- src/glsl/opt_cse.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/glsl/opt_cse.cpp b/src/glsl/opt_cse.cpp index c0fdb23..c53b4c6 100644 --- a/src/glsl/opt_cse.cpp +++ b/src/glsl/opt_cse.cpp

[Mesa-dev] [PATCH] i965: convert brw_lower_offset_array_visitor to ir_rvalue_visitor

2013-11-09 Thread Chris Forbes
Previously, we would bogusly replace the entire statement containing the ir_texture node with an ir_dereference_variable. Correct this to just replace the ir_texture node itself as intended. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_lower_offset_array.cpp

[Mesa-dev] [RFC PATCH 3/5] glsl: add ir_binop_interpolate_at_offset

2013-11-10 Thread Chris Forbes
Will be used to implement interpolateAtOffset() and interpolateAtSample() from ARB_gpu_shader5. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ir.cpp| 2 ++ src/glsl/ir.h | 10 +- src/glsl/ir_builder.cpp

[Mesa-dev] [RFC PATCH 0/5] ARB_gpu_shader5 interpolateAt* GLSL plumbing

2013-11-10 Thread Chris Forbes
Here is the driver-independent part of ARB_gpu_shader5's interpolateAtCentroid, interpolateAtOffset builtins. Before I go further with this approach, I'd like feedback on the following: 1) I've (ab)used ir_var_shader_in variable mode in function signatures to enforce the strange restrictions

[Mesa-dev] [RFC PATCH 4/5] glsl: add interpolateAtCentroid builtin

2013-11-10 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/builtin_functions.cpp | 18 ++ 1 file changed, 18 insertions(+) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 8cb75e5..3ea3a3f 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src/glsl

[Mesa-dev] [RFC PATCH 5/5] glsl: add interpolateAtOffset builtin

2013-11-10 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/builtin_functions.cpp | 19 +++ 1 file changed, 19 insertions(+) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl/builtin_functions.cpp index 3ea3a3f..c55115c 100644 --- a/src/glsl/builtin_functions.cpp +++ b/src

[Mesa-dev] [RFC PATCH 2/5] glsl: add ir_unop_interpolate_at_centroid

2013-11-10 Thread Chris Forbes
Will be used to implement interpolateAtCentroid() from ARB_gpu_shader5. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ir.cpp| 2 ++ src/glsl/ir.h | 9 - src/glsl/ir_builder.cpp| 6 ++ src/glsl

[Mesa-dev] [RFC PATCH 6/5] mesa: add statevar for sample position palette

2013-11-10 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/program/prog_statevars.c | 14 ++ src/mesa/program/prog_statevars.h | 1 + 2 files changed, 15 insertions(+) diff --git a/src/mesa/program/prog_statevars.c b/src/mesa/program/prog_statevars.c index f6fd535..cc923bb 100644

[Mesa-dev] [RFC PATCH 7/5] glsl: add builtin uniform for sample positions palette

2013-11-10 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/builtin_variables.cpp | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/glsl/builtin_variables.cpp b/src/glsl/builtin_variables.cpp index 4d44104..796e18e 100644 --- a/src/glsl/builtin_variables.cpp +++ b/src/glsl

Re: [Mesa-dev] [PATCH V3 00/13] ARB_draw_indirect for i965

2013-11-11 Thread Chris Forbes
Thanks, Paul. Now just seeking r-b for 1, 6, and 12. Anyone? On Tue, Nov 12, 2013 at 8:37 AM, Paul Berry stereotype...@gmail.com wrote: On 9 November 2013 01:02, Chris Forbes chr...@ijw.co.nz wrote: This series adds support for ARB_draw_indirect and ARB_multi_draw_indirect on Gen7+. Big

[Mesa-dev] [PATCH V2 1/3] allow builtin functions to require parameters to be shader inputs

2013-11-11 Thread Chris Forbes
The new interpolateAt* builtins have strange restrictions on the interpolant parameter. - It must be a shader input, or an element of a shader input array. - It must not include a swizzle. V2: Don't abuse ir_var_mode_shader_in for this; make a new flag. Signed-off-by: Chris Forbes chr

[Mesa-dev] [PATCH V2 2/3] glsl: add new expression types for interpolateAt*

2013-11-11 Thread Chris Forbes
Will be used to implement interpolateAtCentroid(), interpolateAtOffset() and interpolateAtSample() from ARB_gpu_shader5 Will be used to implement interpolateAtCentroid() from ARB_gpu_shader5. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ir.cpp| 6

[Mesa-dev] [PATCH V2 0/3] ARB_gpu_shader5 interpolateAt* plumbing

2013-11-11 Thread Chris Forbes
This series adds the driver-independent bits for the following new builtin functions in ARB_gpu_shader5: - interpolateAtCentroid - interpolateAtOffset - interpolateAtSample Passes all the compiler piglits for these builtins. Big changes from the RFC series from the other day: - Don't abuse

[Mesa-dev] [PATCH V2 3/3] glsl: add new interpolateAt* builtin functions

2013-11-11 Thread Chris Forbes
definition. - Only expose the interpolateAt* builtins in the fragment language. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/builtin_functions.cpp | 67 ++ 1 file changed, 67 insertions(+) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl

Re: [Mesa-dev] [PATCH V2 2/3] glsl: add new expression types for interpolateAt*

2013-11-11 Thread Chris Forbes
Sorry, that commit message ended up a mess. On Tue, Nov 12, 2013 at 8:45 PM, Chris Forbes chr...@ijw.co.nz wrote: Will be used to implement interpolateAtCentroid(), interpolateAtOffset() and interpolateAtSample() from ARB_gpu_shader5 Will be used to implement interpolateAtCentroid() from

Re: [Mesa-dev] [PATCH V3 13/13] i965: Enable ARB_draw_indirect (and ARB_multi_draw_indirect) on Gen7+

2013-11-12 Thread Chris Forbes
Relnotes change will need to go into 10.1; will fix when this lands. On Sat, Nov 9, 2013 at 10:02 PM, Chris Forbes chr...@ijw.co.nz wrote: .. and mark them off on the extensions list as done. V2: Enable only if pipelined register writes work. V3: Also update relnotes Signed-off-by: Chris

Re: [Mesa-dev] [PATCH V3 12/13] vbo: map indirect buffer and extract params if doing sw primitive restart

2013-11-12 Thread Chris Forbes
There's a test for the SW primitive restart interaction in piglit. On Wed, Nov 13, 2013 at 9:45 AM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/09/2013 01:02 AM, Chris Forbes wrote: V2: Check for mapping failure (thanks Brian) V3: - Change error on mapping failure to OUT_OF_MEMORY

Re: [Mesa-dev] [PATCH 01/15] i965/fs: Remove force_sechalf stack

2013-11-13 Thread Chris Forbes
This patch is Reviewed-by: Chris Forbes chr...@ijw.co.nz This does impact on the dual-simd8 texture support, but that should be fixable similarly. -- Chris On Thu, Nov 14, 2013 at 12:51 PM, Anuj Phogat anuj.pho...@gmail.com wrote: On Tue, Nov 12, 2013 at 5:50 PM, Kenneth Graunke kenn

Re: [Mesa-dev] [PATCH 02/15] i965: Move enum brw_urb_write_flags from brw_eu.h to brw_defines.h.

2013-11-13 Thread Chris Forbes
Reviewed-by: Chris Forbes chr...@ijw.co.nz On Wed, Nov 13, 2013 at 2:50 PM, Kenneth Graunke kenn...@whitecape.org wrote: Broadwell code should not include brw_eu.h (since it is for Gen4-7 assembly encoding), but needs the URB write flags enum. Signed-off-by: Kenneth Graunke kenn

Re: [Mesa-dev] [PATCH 03/15] i965: Make swizzle_to_scs non-static.

2013-11-13 Thread Chris Forbes
Reviewed-by: Chris Forbes chr...@ijw.co.nz Without any docs, I don't feel qualified enough to review beyond this patch, but it looks generally sensible. On Wed, Nov 13, 2013 at 2:50 PM, Kenneth Graunke kenn...@whitecape.org wrote: We'll need this for Broadwell code as well. Normally, when we

Re: [Mesa-dev] [PATCH 2/2] i965: Allow blorp to make decisions about the formats that it supports where it can

2013-11-14 Thread Chris Forbes
Why does this affect that piglit test? -- Chris On Fri, Nov 15, 2013 at 2:01 PM, Mark Mueller markkmuel...@gmail.com wrote: fixed subject line On Thu, Nov 14, 2013 at 4:15 PM, Mark Mueller markkmuel...@gmail.com wrote: This patch consolidates the decision about formats that blorp_blt does

Re: [Mesa-dev] [PATCH V3 05/13] mesa: Add validation helpers for new indirect draws

2013-11-15 Thread Chris Forbes
Ken, I don't have access to another implementation at the moment -- can you test? -- Chris On Wed, Nov 13, 2013 at 9:57 AM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/12/2013 12:35 PM, Paul Berry wrote: On 12 November 2013 12:13, Kenneth Graunke kenn...@whitecape.org

[Mesa-dev] [PATCH 3/3] i965: Fix broken asserts

2013-11-16 Thread Chris Forbes
These would never fire. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_fs_channel_expressions.cpp | 2 +- src/mesa/drivers/dri/i965/brw_vec4_vp.cpp| 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965

[Mesa-dev] [PATCH 1/3] r600/sb: Fix broken assert

2013-11-16 Thread Chris Forbes
This would never fire. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/gallium/drivers/r600/sb/sb_sched.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/drivers/r600/sb/sb_sched.cpp b/src/gallium/drivers/r600/sb/sb_sched.cpp index 2792315..1413916 100644

[Mesa-dev] [PATCH 2/3] st/vega: Fix broken assert

2013-11-16 Thread Chris Forbes
This would never fire. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/gallium/state_trackers/vega/paint.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/vega/paint.c b/src/gallium/state_trackers/vega/paint.c index 79b7a27..fea9fc1 100644

[Mesa-dev] [PATCH] mesa: bump version to 10.1 (devel)

2013-11-16 Thread Chris Forbes
Now that branch 10.0 is created, bump the minor version in master. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- VERSION | 2 +- docs/relnotes.html | 1 + docs/relnotes/10.1.html | 60 + 3 files changed, 62 insertions

Re: [Mesa-dev] [PATCH 1/4] docs: add a note about removed state tracker/targets

2013-11-16 Thread Chris Forbes
For the series: Acked-by: Chris Forbes chr...@ijw.co.nz On Sun, Nov 17, 2013 at 12:27 PM, Emil Velikov emil.l.veli...@gmail.com wrote: The X.Org state tracker is gone, as well as the xvmc/vdpau r300 and softpipe targets. Cc: 10.0 mesa-sta...@lists.freedesktop.org Signed-off-by: Emil Velikov

Re: [Mesa-dev] [PATCH V3 05/13] mesa: Add validation helpers for new indirect draws

2013-11-19 Thread Chris Forbes
OK, I'll go back to allowing zero. It's silly but harmless. On Wed, Nov 20, 2013 at 8:29 AM, Ian Romanick i...@freedesktop.org wrote: On 11/09/2013 01:02 AM, Chris Forbes wrote: Based on part of Patch 2 of Christoph Bumiller's ARB_draw_indirect series. V3: - Disallow primcount==0

Re: [Mesa-dev] [PATCH V3 06/13] vbo: Flesh out implementation of indirect draws

2013-11-19 Thread Chris Forbes
I've inherited a fair amount of sillyness from the original patches... sorry, I'll clean that up. On Wed, Nov 20, 2013 at 9:15 AM, Ian Romanick i...@freedesktop.org wrote: With the issues below fixed, Reviewed-by: Ian Romanick ian.d.roman...@intel.com On 11/09/2013 01:02 AM, Chris Forbes

Re: [Mesa-dev] [PATCH 1/5] mesa: Track number of layers in layered framebuffers.

2013-11-19 Thread Chris Forbes
+ if (layer_count 0) { + fb-NumLayers = layer_count; It seems like in the nonlayered case there will just be junk left in fb-NumLayers, which might trip people up in future? ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org

Re: [Mesa-dev] [PATCH 2/2] mesa: Implement GL_FRAMEBUFFER_ATTACHMENT_LAYERED query.

2013-11-20 Thread Chris Forbes
These two are: Reviewed-by: Chris Forbes chr...@ijw.co.nz On Wed, Nov 20, 2013 at 8:02 PM, Paul Berry stereotype...@gmail.com wrote: From section 6.1.18 (Renderbuffer Object Queries) of the GL 3.2 spec, under the heading If the value of FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE is TEXTURE

Re: [Mesa-dev] [PATCH 2/5] meta: fix meta clear of layered framebuffers

2013-11-20 Thread Chris Forbes
If I'm reading this right, there is now *always* a GS in the clear program, if the driver can support it -- is this possibly silly, given that most clears will be nonlayered? My understanding is that switching the GS stage on and off carries pretty severe penalties on some hardware. It might be

Re: [Mesa-dev] [PATCH 1/5] mesa: Track number of layers in layered framebuffers.

2013-11-20 Thread Chris Forbes
With those two changes, this is Reviewed-by: Chris Forbes chr...@ijw.co.nz On Thu, Nov 21, 2013 at 8:05 AM, Paul Berry stereotype...@gmail.com wrote: On 20 November 2013 03:18, Marek Olšák mar...@gmail.com wrote: On Wed, Nov 20, 2013 at 5:47 AM, Paul Berry stereotype...@gmail.com wrote

Re: [Mesa-dev] [PATCH 01/18] mesa: Change scissor dd interface for viewport_array

2013-11-20 Thread Chris Forbes
For patches 1/2/3, I think you should add explicit (void) idx; to the various implementations, at least when the surrounding code uses that convention for marking other parameters unused. On Thu, Nov 21, 2013 at 11:59 AM, Courtney Goeltzenleuchter court...@lunarg.com wrote: Signed-off-by:

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-20 Thread Chris Forbes
These are bogus: +enum name=SCISSOR_BOX value=0x0C10/ +enum name=VIEWPORT value=0x0BA2/ +enum name=DEPTH_RANGE value=0x0B70/ +enum name=SCISSOR_TEST value=0x0C11/ +enum name=FIRST_VERTEX_CONVENTION value=0x0C10/ 0x8E4D +enum name=LAST_VERTEX_CONVENTION value=0x8E4E/

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-20 Thread Chris Forbes
Oops -- the 8E4E is obviously correct. Artifact of me switching how I was commenting halfway through. On Thu, Nov 21, 2013 at 3:25 PM, Chris Forbes chr...@ijw.co.nz wrote: These are bogus: +enum name=SCISSOR_BOX value=0x0C10/ +enum name=VIEWPORT value=0x0BA2/ +enum name

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-21 Thread Chris Forbes
On Thu, Nov 21, 2013 at 1:00 PM, Chris Forbes chr...@ijw.co.nz wrote: I'm surprised the build system accepts the conflicting second definition of SCISSOR_BOX at all, actually -- that's weird. On Fri, Nov 22, 2013 at 8:55 AM, Chris Forbes chr...@ijw.co.nz wrote: I mean some of the values

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-21 Thread Chris Forbes
I mean some of the values don't match the spec :) On Fri, Nov 22, 2013 at 7:52 AM, Courtney Goeltzenleuchter court...@lunarg.com wrote: On Wed, Nov 20, 2013 at 7:28 PM, Chris Forbes chr...@ijw.co.nz wrote: Oops -- the 8E4E is obviously correct. Artifact of me switching how I

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-21 Thread Chris Forbes
I'm surprised the build system accepts the conflicting second definition of SCISSOR_BOX at all, actually -- that's weird. On Fri, Nov 22, 2013 at 8:55 AM, Chris Forbes chr...@ijw.co.nz wrote: I mean some of the values don't match the spec :) On Fri, Nov 22, 2013 at 7:52 AM, Courtney

Re: [Mesa-dev] [PATCH 15/18] mesa: Add ARB_viewport_array plumbing

2013-11-22 Thread Chris Forbes
On Thu, Nov 21, 2013 at 4:41 PM, Chris Forbes chr...@ijw.co.nz wrote: I was just comparing to the list in the ARB_viewport_array spec. On Fri, Nov 22, 2013 at 11:33 AM, Courtney Goeltzenleuchter court...@lunarg.com wrote: Hi Chris, Where are you getting your defines? I copied them from

[Mesa-dev] [RFC PATCH V3 00/10] ARB_gpu_shader5 interpolateAt* support for i965

2013-11-23 Thread Chris Forbes
Third respin of the basic idea, with a complete-ish i965 backend now. Works, except for a few things: - Varying packing interaction is pretty bogus. Currently we look inside the ir_swizzle that got generated, and don't correct for it, so this only works for varyings which get packed into the

[Mesa-dev] [RFC PATCH V3 02/10] glsl: add new expression types for interpolateAt*

2013-11-23 Thread Chris Forbes
Will be used to implement interpolateAtCentroid(), interpolateAtOffset() and interpolateAtSample() from ARB_gpu_shader5 Will be used to implement interpolateAtCentroid() from ARB_gpu_shader5. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ir.cpp| 6

[Mesa-dev] [RFC PATCH V3 10/10] i965/fs: add support for ir_*_interpolate_at_*

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 99 +++- 1 file changed, 98 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp b/src/mesa/drivers/dri/i965/brw_fs_visitor.cpp index 538f1b3

[Mesa-dev] [RFC PATCH V3 05/10] i965/disasm: add support for pixel interpolator messages

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_disasm.c | 16 +++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/i965/brw_disasm.c b/src/mesa/drivers/dri/i965/brw_disasm.c index 128e717..d6c30c4 100644 --- a/src

[Mesa-dev] [RFC PATCH V3 03/10] glsl: add new interpolateAt* builtin functions

2013-11-23 Thread Chris Forbes
definition. - Only expose the interpolateAt* builtins in the fragment language. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/builtin_functions.cpp | 67 ++ 1 file changed, 67 insertions(+) diff --git a/src/glsl/builtin_functions.cpp b/src/glsl

[Mesa-dev] [RFC PATCH V3 07/10] i965/fs: add generator support for pixel interpolator query

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_defines.h| 1 + src/mesa/drivers/dri/i965/brw_fs.cpp | 2 ++ src/mesa/drivers/dri/i965/brw_fs.h | 13 - src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 19

[Mesa-dev] [RFC PATCH V3 06/10] i965: add low-level support for send to pixel interpolator

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_eu.h | 10 +++ src/mesa/drivers/dri/i965/brw_eu_emit.c | 50 + 2 files changed, 60 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_eu.h b/src/mesa/drivers/dri/i965

[Mesa-dev] [RFC PATCH V3 09/10] i965/fs: add new helper function for emitting interpolateAt* exprs

2013-11-23 Thread Chris Forbes
The implementation is going to be nontrivial, so let's get it out of visit(). Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_fs.h | 1 + src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 29 ++-- 2 files changed, 28 insertions(+), 2

[Mesa-dev] [RFC PATCH V3 08/10] i965/fs: Skip channel expressions splitting for interpolation

2013-11-23 Thread Chris Forbes
The backend will have to do a message send, so we want to keep these in one piece, just like texture ops. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- .../dri/i965/brw_fs_channel_expressions.cpp| 28 ++ 1 file changed, 28 insertions(+) diff --git a/src/mesa

[Mesa-dev] [RFC PATCH V3 01/10] allow builtin functions to require parameters to be shader inputs

2013-11-23 Thread Chris Forbes
The new interpolateAt* builtins have strange restrictions on the interpolant parameter. - It must be a shader input, or an element of a shader input array. - It must not include a swizzle. V2: Don't abuse ir_var_mode_shader_in for this; make a new flag. Signed-off-by: Chris Forbes chr

[Mesa-dev] [RFC PATCH V3 04/10] i965: add struct and SFID for pixel interpolator messages

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_defines.h | 1 + src/mesa/drivers/dri/i965/brw_structs.h | 21 + 2 files changed, 22 insertions(+) diff --git a/src/mesa/drivers/dri/i965/brw_defines.h b/src/mesa/drivers/dri/i965/brw_defines.h

Re: [Mesa-dev] [PATCH 3/6] glsl: Merge candidates are: message to the previous line.

2013-11-23 Thread Chris Forbes
One would hope that it doesn't actually offer overloads of sin() when you tried to call cos()? Actual change looks good; Reviewed-by: Chris Forbes chr...@ijw.co.nz On Sun, Nov 24, 2013 at 10:43 AM, Kenneth Graunke kenn...@whitecape.org wrote: Previously, when we hit a no matching function

[Mesa-dev] [PATCH 5/5] docs: describe the INTEL_* envvars that do exist

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- docs/envvars.html | 32 1 file changed, 32 insertions(+) diff --git a/docs/envvars.html b/docs/envvars.html index 81e74e6..d831826 100644 --- a/docs/envvars.html +++ b/docs/envvars.html @@ -121,6 +121,38 @@ See

[Mesa-dev] [PATCH 2/5] docs: drop INTEL_* envvars which no longer exist

2013-11-23 Thread Chris Forbes
These were removed back in 2012. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- docs/envvars.html | 4 1 file changed, 4 deletions(-) diff --git a/docs/envvars.html b/docs/envvars.html index 67d8e29..81e74e6 100644 --- a/docs/envvars.html +++ b/docs/envvars.html @@ -121,10 +121,6 @@ See

[Mesa-dev] [PATCH 4/5] i965: remove unused DEBUG_IOCTL

2013-11-23 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/intel_debug.c | 1 - src/mesa/drivers/dri/i965/intel_debug.h | 1 - 2 files changed, 2 deletions(-) diff --git a/src/mesa/drivers/dri/i965/intel_debug.c b/src/mesa/drivers/dri/i965/intel_debug.c index 0c45c99..7180e18

[Mesa-dev] [PATCH 3/5] radeon: change last instance of DEBUG_IOCTL to use RADEON_IOCTL

2013-11-23 Thread Chris Forbes
DEBUG_IOCTL comes from i965, and is about to be removed. Both defines have the same value (4). Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/radeon/radeon_ioctl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mesa/drivers/dri/radeon

[Mesa-dev] [PATCH 1/5] docs: bump supported shading language version

2013-11-23 Thread Chris Forbes
--- docs/shading.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/shading.html b/docs/shading.html index 19e20b1..4015cdf 100644 --- a/docs/shading.html +++ b/docs/shading.html @@ -67,7 +67,7 @@ Example: export MESA_GLSL=dump,nopt h2 id=supportGLSL Version/h2 p

Re: [Mesa-dev] [PATCH 14/17] Modified i915 intel_bufferobj_data to use _mesa_align_malloc instead of malloc.

2013-11-24 Thread Chris Forbes
I'm not convinced that just using _mesa_align_malloc() is sufficient here. Issue 2 from the ARB_map_buffer_alignment spec says: 2) What alignment should be used for MapBufferRange when offset is non-zero? RESOLVED: The pointer returned should be consistent with the base of the

Re: [Mesa-dev] [PATCH 00/17] Newbie Project : Enable ARB_map_buffer_alignment in all drivers

2013-11-24 Thread Chris Forbes
Tim's correct -- in this case you probably want to move the PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT case up above the big 'this cap is unsupported' catch-all. -- Chris On Mon, Nov 25, 2013 at 7:07 PM, Timothy Arceri t_arc...@yahoo.com.au wrote: I've only had a very quick scan over your patches but I

Re: [Mesa-dev] [PATCH 00/17] Newbie Project : Enable ARB_map_buffer_alignment in all drivers

2013-11-24 Thread Chris Forbes
Ah, I see you have a follow-up that fixes this already. Looks good, sorry for the noise. -- Chris On Mon, Nov 25, 2013 at 8:19 PM, Chris Forbes chr...@ijw.co.nz wrote: Tim's correct -- in this case you probably want to move the PIPE_CAP_MIN_MAP_BUFFER_ALIGNMENT case up above the big 'this cap

Re: [Mesa-dev] [PATCH 02/11] mesa: Add ARB_shader_image_load_store to the extension table.

2013-11-24 Thread Chris Forbes
Does this want to be enabled in compatibility? I had assumed we wouldn't, for the same reasons we don't enable texbo there. On Mon, Nov 25, 2013 at 6:00 PM, Francisco Jerez curroje...@riseup.net wrote: --- src/mesa/main/extensions.c | 1 + src/mesa/main/mtypes.h | 1 + 2 files changed, 2

Re: [Mesa-dev] [PATCH 03/11] mesa: Add state data structures requried for ARB_shader_image_load_store.

2013-11-24 Thread Chris Forbes
In the commit message, s/requried/required/ Does holding onto the whole texture object make things easier? I had assumed you could get by just referencing the right gl_texture_image, but maybe that doesn't work out. On Mon, Nov 25, 2013 at 6:00 PM, Francisco Jerez curroje...@riseup.net wrote:

Re: [Mesa-dev] [PATCH 10/11] mesa: Validate image units when the texture state changes.

2013-11-24 Thread Chris Forbes
It would be nice not to have to touch this memory when the extension is unused|unsupported, but that might be a problem for another patch... -- Chris On Mon, Nov 25, 2013 at 6:00 PM, Francisco Jerez curroje...@riseup.net wrote: --- src/mesa/main/shaderimage.c | 11 +++

Re: [Mesa-dev] [PATCH 00/17] Newbie Project : Enable ARB_map_buffer_alignment in all drivers

2013-11-24 Thread Chris Forbes
wrote: On 11/25/2013 10:50 AM, Chris Forbes wrote: Ah, I see you have a follow-up that fixes this already. Looks good, sorry for the noise. -- Chris I'm pretty new here and I'm not used to mailing lists, sorry if patches aren't showing up in correct place. Should I send all of patches

Re: [Mesa-dev] [PATCH 00/11] Core mesa changes for ARB_shader_image_load_store.

2013-11-24 Thread Chris Forbes
Patches 1-4, 8-11 are: Reviewed-by: Chris Forbes chr...@ijw.co.nz With the bounds checks fixed, patch 5 is also: Reviewed-by: Chris Forbes chr...@ijw.co.nz I haven't had time to read 6-7 carefully enough to convince myself they are correct, but you can consider them Acked-by: Chris Forbes chr

Re: [Mesa-dev] [PATCH 5/5] docs: describe the INTEL_* envvars that do exist

2013-11-25 Thread Chris Forbes
I've pushed these now, including dropping the old names for those debug bits. I've left the stats stuff as-is for now, but suggested more useful options in the docs. On Mon, Nov 25, 2013 at 4:44 AM, Kenneth Graunke kenn...@whitecape.org wrote: On 11/23/2013 09:13 PM, Chris Forbes wrote: Signed

Re: [Mesa-dev] [PATCH 03/11] mesa: Add state data structures requried for ARB_shader_image_load_store.

2013-11-25 Thread Chris Forbes
That makes good sense. On Tue, Nov 26, 2013 at 6:45 AM, Francisco Jerez curroje...@riseup.net wrote: Chris Forbes chr...@ijw.co.nz writes: In the commit message, s/requried/required/ Does holding onto the whole texture object make things easier? I had assumed you could get by just

Re: [Mesa-dev] [PATCH 10/11] mesa: Validate image units when the texture state changes.

2013-11-25 Thread Chris Forbes
Ah, of course; so it's not a factor for driver which don't expose the extension at all. The `unused` side still stands as a vague concern, I think -- we currently pay for lots of things that most apps don't use. On Tue, Nov 26, 2013 at 6:43 AM, Francisco Jerez curroje...@riseup.net wrote: Chris

Re: [Mesa-dev] [PATCH 1/2] i965/gs: Properly skip GS binding table upload when no GS active.

2013-11-25 Thread Chris Forbes
Ouch. Reviewed-by: Chris Forbes chr...@ijw.co.nz On Tue, Nov 26, 2013 at 5:23 AM, Paul Berry stereotype...@gmail.com wrote: Previously, in brw_gs_upload_binding_table(), we checked whether brw-gs.prog_data was NULL in order to determine whether a geometry shader was active. This didn't work

Re: [Mesa-dev] [PATCH 02/23] glsl: Add image type to the GLSL IR.

2013-11-26 Thread Chris Forbes
@@ -618,6 +637,9 @@ glsl_type::component_slots() const case GLSL_TYPE_ARRAY: return this-length * this-fields.array-component_ slots(); + case GLSL_TYPE_IMAGE: + return 1; Why is an image type one component, whereas the other opaque types are zero at this level? On Tue, Nov

Re: [Mesa-dev] [PATCH 02/23] glsl: Add image type to the GLSL IR.

2013-11-26 Thread Chris Forbes
Sounds pretty reasonable. Is this a sensible direction for samplers to go in eventually as well? -- Chris On Wed, Nov 27, 2013 at 7:51 AM, Francisco Jerez curroje...@riseup.net wrote: Hi Chris, Chris Forbes chr...@ijw.co.nz writes: @@ -618,6 +637,9 @@ glsl_type::component_slots() const

Re: [Mesa-dev] [PATCH 02/23] glsl: Add image type to the GLSL IR.

2013-11-26 Thread Chris Forbes
Do you have a suite of piglit tests for this extension? On Wed, Nov 27, 2013 at 8:01 AM, Chris Forbes chr...@ijw.co.nz wrote: Sounds pretty reasonable. Is this a sensible direction for samplers to go in eventually as well? -- Chris On Wed, Nov 27, 2013 at 7:51 AM, Francisco Jerez curroje

Re: [Mesa-dev] [PATCH] Fixed memory leak.

2013-11-27 Thread Chris Forbes
Patches 16, 17 are: Reviewed-by: Chris Forbes chr...@ijw.co.nz I'm not quite sure I buy the 4K alignment for i965 in patch 15 -- it's true that any real BO mappings will be 4K-aligned, but when we have to return a temporary chunk of memory this seems excessive. Ian? On Wed, Nov 27, 2013 at 11

Re: [Mesa-dev] [PATCH 5/5] docs: describe the INTEL_* envvars that do exist

2013-11-27 Thread Chris Forbes
Yikes, really sorry for the trouble. -- Chris On Thu, Nov 28, 2013 at 10:40 AM, Matt Turner matts...@gmail.com wrote: On Mon, Nov 25, 2013 at 12:20 AM, Chris Forbes chr...@ijw.co.nz wrote: I've pushed these now, including dropping the old names for those debug bits. I've left the stats stuff

Re: [Mesa-dev] [PATCH 2/4] glsl: Fix loop analysis of nested loops.

2013-11-28 Thread Chris Forbes
+ /* The assignmnet to the variable in the loop must be unconditional and + * not inside a nested loop. */ s/assignmnet/assignment/ ___ mesa-dev mailing list mesa-dev@lists.freedesktop.org

[Mesa-dev] [PATCH 0/6] Add support for 'sample' qualifier

2013-11-29 Thread Chris Forbes
This series adds the mesa and glsl compiler support for the new 'sample in' and 'sample out' qualifiers from GLSL 4.0 / ARB_gpu_shader5. Driver support (beyond triggering per-sample fragment shader evaluation) is not yet implemented. ___ mesa-dev

[Mesa-dev] [PATCH 4/6] mesa: add IsSample bitfield to gl_fragment_program

2013-11-29 Thread Chris Forbes
Drivers will need to look at this to decide if they need to do per-sample fragment shader dispatch. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/main/mtypes.h | 6 ++ 1 file changed, 6 insertions(+) diff --git a/src/mesa/main/mtypes.h b/src/mesa/main/mtypes.h index b4b432f

[Mesa-dev] [PATCH 3/6] glsl: Put `sample`-qualified varyings in their own packing classes

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/link_varyings.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/glsl/link_varyings.cpp b/src/glsl/link_varyings.cpp index d2a4fc8..097cee5 100644 --- a/src/glsl/link_varyings.cpp +++ b/src/glsl/link_varyings.cpp

[Mesa-dev] [PATCH 5/6] glsl: Populate gl_fragment_program::IsSample bitfield

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ir_set_program_inouts.cpp | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/glsl/ir_set_program_inouts.cpp b/src/glsl/ir_set_program_inouts.cpp index ab23538..1a36527 100644 --- a/src/glsl

[Mesa-dev] [PATCH 1/6] glsl: Add frontend support for `sample` auxiliary storage qualifier

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ast.h | 1 + src/glsl/ast_type.cpp | 3 ++- src/glsl/glsl_lexer.ll | 2 +- src/glsl/glsl_parser.yy | 9 +++-- src/glsl/glsl_parser_extras.cpp | 2 ++ 5 files changed, 13 insertions(+), 4

[Mesa-dev] [PATCH 6/6] mesa: Require per-sample shading if the `sample` qualifier is used.

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/program/program.c | 8 1 file changed, 8 insertions(+) diff --git a/src/mesa/program/program.c b/src/mesa/program/program.c index 01f8c6f..cdf1c03 100644 --- a/src/mesa/program/program.c +++ b/src/mesa/program/program.c

[Mesa-dev] [PATCH 2/6] glsl: Add ir support for `sample` qualifier; adjust compiler and linker

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/glsl/ast_to_hir.cpp | 15 +++ src/glsl/builtin_variables.cpp| 2 ++ src/glsl/glsl_types.cpp | 5 + src/glsl/glsl_types.h | 6 ++ src/glsl/ir.cpp

[Mesa-dev] [PATCH] i965: Don't flag gather quirks for Gen8+

2013-11-29 Thread Chris Forbes
My understanding is that Broadwell retains the same SCS mechanism that Haswell has, so even if the underlying issue with this format is not fixed, the w/a will be applied in SCS rather than needing shader code. Signed-off-by: Chris Forbes chr...@ijw.co.nz Cc: Kenneth Graunke kenn...@whitecape.org

[Mesa-dev] [PATCH 5/6] i965/vs: Sample from MCS surface when required

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_vec4.h | 1 + src/mesa/drivers/dri/i965/brw_vec4_visitor.cpp | 41 +- 2 files changed, 35 insertions(+), 7 deletions(-) diff --git a/src/mesa/drivers/dri/i965/brw_vec4.h b/src/mesa

[Mesa-dev] [PATCH 1/6] i965: make compute_msaa_layout() nonstatic, add intel_ prefix

2013-11-29 Thread Chris Forbes
We're about to need this in the computation of the sampler key. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 6 +++--- src/mesa/drivers/dri/i965/intel_mipmap_tree.h | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src

[Mesa-dev] [PATCH 0/6] i965: Enable CMS layout for multisample textures

2013-11-29 Thread Chris Forbes
This series enables the compressed multisample layout for multisample textures. Previously we would only use CMS for renderbuffers, since our texelFetch() implementation didn't understand it. Known to break the sample-mask-execution -tex test, but not sure why yet -- it doesn't use texelFetch().

[Mesa-dev] [PATCH 6/6] i965/Gen7: Allow CMS layout for multisample textures

2013-11-29 Thread Chris Forbes
Now that all the pieces are in place, this should provide a nice performance boost for apps using multisample textures. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/intel_mipmap_tree.c | 18 +- 1 file changed, 1 insertion(+), 17 deletions(-) diff

[Mesa-dev] [PATCH 3/6] i965: Add shader opcode for sampling MCS surface

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_defines.h | 1 + src/mesa/drivers/dri/i965/brw_fs.cpp | 1 + src/mesa/drivers/dri/i965/brw_fs_generator.cpp | 5 + src/mesa/drivers/dri/i965/brw_shader.cpp | 3 +++ src/mesa/drivers

[Mesa-dev] [PATCH 4/6] i965/fs: Sample from MCS surface when required

2013-11-29 Thread Chris Forbes
Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_fs.h | 3 +- src/mesa/drivers/dri/i965/brw_fs_fp.cpp | 2 +- src/mesa/drivers/dri/i965/brw_fs_visitor.cpp | 46 +++- 3 files changed, 41 insertions(+), 10 deletions(-) diff

[Mesa-dev] [PATCH 2/6] i965/Gen7: Include bitfield in the sampler key for CMS layout

2013-11-29 Thread Chris Forbes
We need to emit extra shader code in this case to sample the MCS surface first; we can't just blindly do this all the time since IVB will sometimes try to access the MCS surface even if disabled. Signed-off-by: Chris Forbes chr...@ijw.co.nz --- src/mesa/drivers/dri/i965/brw_program.h | 5

Re: [Mesa-dev] [PATCH 0/6] i965: Enable CMS layout for multisample textures

2013-11-30 Thread Chris Forbes
Chasing down the sample-mask-execution failure revealed some other missing machinery; will resend once everything is working. On Sat, Nov 30, 2013 at 2:21 PM, Chris Forbes chr...@ijw.co.nz wrote: This series enables the compressed multisample layout for multisample textures. Previously we

<    1   2   3   4   5   6   7   8   9   10   >