search for: nvc0_state

...call set_sample_mask, so we ended up with the ctx->sample_mask never being set. This broke a number of EXT_framebuffer_multisample piglit tests. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/gallium/drivers/nouveau/nv50/nv50_state.c | 2 ++ src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_state.c b/src/gallium/drivers/nouveau/nv50/nv50_state.c index b6a180e..87dd07f 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_state.c +++ b/src/gallium/drivers/nouveau/nv50/nv50_state.c @@ -1123,4 +11...

...| 29 ++++++++++++++++++++++++ src/gallium/drivers/nouveau/nouveau_buffer.h | 4 ++++ src/gallium/drivers/nouveau/nv50/nv50_resource.c | 2 ++ src/gallium/drivers/nouveau/nv50/nv50_state.c | 4 ++++ src/gallium/drivers/nouveau/nvc0/nvc0_resource.c | 2 ++ src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 4 ++++ 6 files changed, 45 insertions(+) diff --git a/src/gallium/drivers/nouveau/nouveau_buffer.c b/src/gallium/drivers/nouveau/nouveau_buffer.c index 5b0b93b..46ab1a1 100644 --- a/src/gallium/drivers/nouveau/nouveau_buffer.c +++ b/src/gallium/drivers/nouveau/nouveau_buffer.c @@ -69,6 +6...

If a transform feedback buffer's size is 0, st_bufferobj_data doesn't end up creating a buffer for it. There's no point in trying to write to such a buffer, so just pretend as if it's not really there. This fixes arb_gpu_shader5-xfb-streams-without-invocations on nvc0. Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/mesa/state_tracker/st_cb_xformfb.c | 2 +- 1

....cpp | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 7 +- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 20 ++-- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 3 + src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 27 +++-- .../drivers/nouveau/nvc0/nvc0_state_validate.c | 116 +++++++++++++-------- 10 files changed, 115 insertions(+), 66 deletions(-) -- 1.8.4.5

...0.cpp | 1 - src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 7 +- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 20 ++-- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 3 + src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 27 ++++- .../drivers/nouveau/nvc0/nvc0_state_validate.c | 121 +++++++++++++-------- src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 3 + 9 files changed, 120 insertions(+), 65 deletions(-) -- 1.8.4.5

Signed-off-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/gallium/drivers/nouveau/nv50/nv50_context.c | 22 ++++++++++++++++++- src/gallium/drivers/nouveau/nv50/nv50_context.h | 1 + src/gallium/drivers/nouveau/nv50/nv50_vbo.c | 29 ++++++++++++++++++++++++- 3 files changed, 50 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_context.c

...t mni.thm.de> --- src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 7 +- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 20 ++-- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 3 + src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 27 +++-- .../drivers/nouveau/nvc0/nvc0_state_validate.c | 116 +++++++++++++-------- 6 files changed, 112 insertions(+), 63 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h index 76416a0..674dd3c 100644 --- a...

...t mni.thm.de> --- src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 7 +- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 2 +- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 20 ++-- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 3 + src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 27 ++++- .../drivers/nouveau/nvc0/nvc0_state_validate.c | 121 +++++++++++++-------- 6 files changed, 117 insertions(+), 63 deletions(-) diff --git a/src/gallium/drivers/nouveau/nvc0/nvc0_context.h b/src/gallium/drivers/nouveau/nvc0/nvc0_context.h index 76416a0..674dd3c 100644 --- a...

...| 8 ++- src/gallium/drivers/nouveau/nvc0/nvc0_program.c | 56 +++++++---------- src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 7 +-- src/gallium/drivers/nouveau/nvc0/nvc0_screen.h | 1 + .../drivers/nouveau/nvc0/nvc0_shader_state.c | 3 - src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 71 ++++++++++++++++++++++ .../drivers/nouveau/nvc0/nvc0_state_validate.c | 11 ++++ src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 34 +++++------ src/gallium/drivers/nouveau/nvc0/nvc0_vbo.c | 9 ++- .../drivers/nouveau/nvc0/nvc0_vbo_translate.c | 3 +- 15 files ch...

Backtrace: ... 0x00007ffff57fc392 in __assert_fail () from /lib64/libc.so.6 0x00007ffff0cf5bec in nvc0_shader_stage (pipe=<optimized out>) at ./nvc0/nvc0_context.h:204 nvc0_set_constant_buffer (pipe=0x631080, shader=<optimized out>, index=<optimized out>, cb=0x0) at nvc0/nvc0_state.c:771 0x00007ffff0a2cf63 in st_destroy_context (st=0x68a9f0) at state_tracker/st_context.c:382 ... Signed-off-by: Tobias Klausmann <tobias.johannes.klausmann at mni.thm.de> --- src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --...

...h | 67 +- src/gallium/drivers/nouveau/nvc0/nvc0_context.h | 5 +- src/gallium/drivers/nouveau/nvc0/nvc0_m2mf.xml.h | 67 +- src/gallium/drivers/nouveau/nvc0/nvc0_macros.h | 32 + src/gallium/drivers/nouveau/nvc0/nvc0_screen.c | 6 +- src/gallium/drivers/nouveau/nvc0/nvc0_state.c | 6 +- src/gallium/drivers/nouveau/nvc0/nvc0_surface.c | 22 +- src/gallium/drivers/nouveau/nvc0/nvc0_tex.c | 12 +- src/gallium/drivers/nouveau/nvc0/nvc0_transfer.c | 8 +- src/gallium/drivers/nouveau/nvc0/nvc0_winsys.h | 4 +- .../drivers/nouveau/nvc0/nve4_com...

...e (prog=prog at entry=0x555555d79fc0, chipset=<optimized out>, debug=debug at entry=0x5555557a74c8) at ../src/gallium/drivers/nouveau/nvc0/nvc0_program.c:624 #8 0x00007ffff2e1121d in nvc0_sp_state_create (pipe=0x5555557a7100, cso=0x7fffffffc490, type=1) at ../src/gallium/drivers/nouveau/nvc0/nvc0_state.c:605 #9 0x00007ffff3042963 in st_create_fp_variant (st=<optimized out>, stfp=stfp at entry=0x555555d74db0, key=key at entry=0x7fffffffc630) at ../src/mesa/state_tracker/st_program.c:1231 #10 0x00007ffff3045253 in st_get_fp_variant (st=<optimized out>, stfp=0x555555d74db0, key=0x7fffff...

...0/nv50_program.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_state.c | 4 +- .../drivers/nouveau/nv50/nv50_state_validate.c | 2 +- src/gallium/drivers/nouveau/nv50/nv50_surface.c | 4 +- .../drivers/nouveau/nv50/nv50_texture.xml.h | 52 +-- .../drivers/nouveau/nvc0/nvc0_state_validate.c | 2 +- 11 files changed, 451 insertions(+), 358 deletions(-) diff --git a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h b/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h index dfbef2c..899d73d 100644 --- a/src/gallium/drivers/nouveau/nv50/nv50_2d.xml.h +++ b/src/gallium/drivers/n...

...UBO). Is it expected to call SSBO validation code when the shader program doesn't use them? If not, a validation shortcut will be nice. If it can help, here the backtrace from nvc0_set_shader_buffers #0 nvc0_set_shader_buffers (pipe=0x87c51e0, shader=0, start=16, nr=16, buffers=0x0) at nvc0/nvc0_state.c:1331 #1 0xf464acc4 in st_bind_ssbos (shader=0x8b106bc, shader_type=0, st=0x877ca38, st=0x877ca38) at state_tracker/st_atom_storagebuf.c:86 #2 0xf464ad0d in bind_vs_ssbos (st=0x877ca38) at state_tracker/st_atom_storagebuf.c:101 #3 0xf4647411 in st_validate_state (st=0x877ca38, pipeline=ST_PIPEL...

From: Ben Skeggs <bskeggs at redhat.com> Signed-off-by: Ben Skeggs <bskeggs at redhat.com> --- src/gallium/drivers/nouveau/nv50/g80_defs.xml.h | 279 ++++++++++++++++++++++++ 1 file changed, 279 insertions(+) create mode 100644 src/gallium/drivers/nouveau/nv50/g80_defs.xml.h diff --git a/src/gallium/drivers/nouveau/nv50/g80_defs.xml.h