search for: p_shader_tokens

...ss the now always zero-sized resources vector. > > Make non buffer / memory file accesses not being supported in these > functions more explicit and comment out a whole bunch of dead code. > > Also remove the magic file-indexe defines from the old resource code > from include/pipe/p_shader_tokens.h as those are no longer used now > (which is a good thing). > > Signed-off-by: Hans de Goede <hdegoede at redhat.com> > --- > .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 42 +++++++++++++++------- > src/gallium/include/pipe/p_shader_tokens.h | 9 ----- &...

These magic file-index defines where only ever used in the nouveau code and that no longer uses them. Signed-off-by: Hans de Goede <hdegoede at redhat.com> --- Changes in v2: -Split out of "nouveau: codegen: Disable more old resource handling code" --- src/gallium/include/pipe/p_shader_tokens.h | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/gallium/include/pipe/p_shader_tokens.h b/src/gallium/include/pipe/p_shader_tokens.h index 65d8ad9..5ef6c30 100644 --- a/src/gallium/include/pipe/p_shader_tokens.h +++ b/src/gallium/include/pipe/p_shader_tokens.h @@ -237,15 +237,6 @@...

Signed-off-by: Karol Herbst <karolherbst at gmail.com> --- src/gallium/auxiliary/tgsi/tgsi_build.c | 1 + src/gallium/include/pipe/p_shader_tokens.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index 00843241f8..55e4d064ed 100644 --- a/src/gallium/auxiliary/tgsi/tgsi_build.c +++ b/src/gallium/auxiliary/tgsi/tgsi_build.c @@ -642,6 +642,7...

Commit c3083c7082 ("nv50/ir: add support for BUFFER accesses") disabled / commented out some of the old resource handling code, but not all of it. Effectively all of it is dead already, if we ever enter the old code paths in handeLOAD / handleSTORE / handleATOM we will get an exception due to trying to access the now always zero-sized resources vector. Disable all the dead code.

...eption due to trying to access the now always zero-sized resources vector. Make non buffer / memory file accesses not being supported in these functions more explicit and comment out a whole bunch of dead code. Also remove the magic file-indexe defines from the old resource code from include/pipe/p_shader_tokens.h as those are no longer used now (which is a good thing). Signed-off-by: Hans de Goede <hdegoede at redhat.com> --- .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 42 +++++++++++++++------- src/gallium/include/pipe/p_shader_tokens.h | 9 ----- 2 files changed, 30 insertions(...

...ized resources vector. >> >> Make non buffer / memory file accesses not being supported in these >> functions more explicit and comment out a whole bunch of dead code. >> >> Also remove the magic file-indexe defines from the old resource code >> from include/pipe/p_shader_tokens.h as those are no longer used now >> (which is a good thing). >> >> Signed-off-by: Hans de Goede <hdegoede at redhat.com> >> --- >> .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 42 +++++++++++++++------- >> src/gallium/include/pipe/p_shader_token...

Hi, Here are patches which implement the support for OpenCL kernel input parameters we discussed. They also add the tgsi parsing bits for adding support for global / local mem, but no implementation yet. Regards, Hans

...si/tgsi_text.c | 14 ++++++++++-- > src/gallium/auxiliary/tgsi/tgsi_ureg.c | 25 > ++++++++++++---------- > src/gallium/auxiliary/tgsi/tgsi_ureg.h | 2 +- > .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 7 +++--- > src/gallium/include/pipe/p_shader_tokens.h | 10 +++++++-- > src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +- > 8 files changed, 51 insertions(+), 26 deletions(-) > > diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c > b/src/gallium/auxiliary/tgsi/tgsi_build.c > index c420ae1..b108ade 100644 > --...

When support for decl.Atomic and .Shared was added, tgsi_build_declaration was not updated to propagate these properly. Signed-off-by: Hans de Goede <hdegoede at redhat.com> Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu> --- Changes in v2: -Add Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu> --- src/gallium/auxiliary/tgsi/tgsi_build.c | 6 ++++++ 1 file changed, 6

...src/gallium/auxiliary/tgsi/tgsi_text.c | 14 ++++++++++-- src/gallium/auxiliary/tgsi/tgsi_ureg.c | 25 ++++++++++++---------- src/gallium/auxiliary/tgsi/tgsi_ureg.h | 2 +- .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 7 +++--- src/gallium/include/pipe/p_shader_tokens.h | 10 +++++++-- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +- 8 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index c420ae1..b108ade 100644 --- a/src/gallium/auxiliary/tgsi/tgs...

...src/gallium/auxiliary/tgsi/tgsi_text.c | 14 ++++++++++-- src/gallium/auxiliary/tgsi/tgsi_ureg.c | 25 ++++++++++++---------- src/gallium/auxiliary/tgsi/tgsi_ureg.h | 2 +- .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 7 +++--- src/gallium/include/pipe/p_shader_tokens.h | 10 +++++++-- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +- 8 files changed, 51 insertions(+), 26 deletions(-) diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c b/src/gallium/auxiliary/tgsi/tgsi_build.c index 1cb95b9..a3e659b 100644 --- a/src/gallium/auxiliary/tgsi/tgs...

...| 14 ++++++++++-- >> src/gallium/auxiliary/tgsi/tgsi_ureg.c | 25 >> ++++++++++++---------- >> src/gallium/auxiliary/tgsi/tgsi_ureg.h | 2 +- >> .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 7 +++--- >> src/gallium/include/pipe/p_shader_tokens.h | 10 +++++++-- >> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 2 +- >> 8 files changed, 51 insertions(+), 26 deletions(-) >> >> diff --git a/src/gallium/auxiliary/tgsi/tgsi_build.c >> b/src/gallium/auxiliary/tgsi/tgsi_build.c >> index c420a...

...diff --git a/src/gallium/drivers/nv30/nv30_fragprog.c b/src/gallium/drivers/nv30/nv30_fragprog.c index cc03854..b42a7be 100644 --- a/src/gallium/drivers/nv30/nv30_fragprog.c +++ b/src/gallium/drivers/nv30/nv30_fragprog.c @@ -4,6 +4,7 @@ #include "pipe/p_inlines.h" #include "pipe/p_shader_tokens.h" +#include "tgsi/tgsi_dump.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_util.h" -- 1.6.5.2

tgsi_default_instruction_memory / tgsi_build_instruction_memory were returning uninitialized memory for tgsi_instruction_memory.Texture and tgsi_instruction_memory.Format. Note 0 means not set, and thus is a correct default initializer for these. Fixes: 3243b6fc97 ("tgsi: add Texture and Format to tgsi_instruction_memory") Cc: Nicolai Hähnle <nicolai.haehnle at amd.com>

...llium/auxiliary/util/u_simple_shaders.c | 2 +- >> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >> .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 16 ++++ >> .../drivers/nouveau/codegen/nv50_ir_peephole.cpp | 6 +- >> src/gallium/include/pipe/p_shader_tokens.h | 3 +- >> src/gallium/state_trackers/nine/nine_shader.c | 6 +- >> src/mesa/state_tracker/st_atifs_to_tgsi.c | 38 ++++----- >> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 92 >> +++++++++++++++++----- >> src/mesa/state_tracker/s...

...si_ureg.h | 20 ++++- src/gallium/auxiliary/util/u_simple_shaders.c | 2 +- src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 16 ++++ .../drivers/nouveau/codegen/nv50_ir_peephole.cpp | 6 +- src/gallium/include/pipe/p_shader_tokens.h | 3 +- src/gallium/state_trackers/nine/nine_shader.c | 6 +- src/mesa/state_tracker/st_atifs_to_tgsi.c | 38 ++++----- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 92 +++++++++++++++++----- src/mesa/state_tracker/st_mesa_to_tgsi.c | 8 +- src/mesa/stat...

...+- > src/gallium/auxiliary/util/u_simple_shaders.c | 2 +- > src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + > .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 16 ++++ > .../drivers/nouveau/codegen/nv50_ir_peephole.cpp | 6 +- > src/gallium/include/pipe/p_shader_tokens.h | 3 +- > src/gallium/state_trackers/nine/nine_shader.c | 6 +- > src/mesa/state_tracker/st_atifs_to_tgsi.c | 38 ++++----- > src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 92 +++++++++++++++++----- > src/mesa/state_tracker/st_mesa_to_tgsi.c...

...util/u_simple_shaders.c | 2 +- >>> src/gallium/drivers/nouveau/codegen/nv50_ir.h | 1 + >>> .../drivers/nouveau/codegen/nv50_ir_from_tgsi.cpp | 16 ++++ >>> .../drivers/nouveau/codegen/nv50_ir_peephole.cpp | 6 +- >>> src/gallium/include/pipe/p_shader_tokens.h | 3 +- >>> src/gallium/state_trackers/nine/nine_shader.c | 6 +- >>> src/mesa/state_tracker/st_atifs_to_tgsi.c | 38 ++++----- >>> src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 92 >>> +++++++++++++++++----- >>> src/...

...anged, 58 insertions(+), 36 deletions(-) diff --git a/src/gallium/drivers/nv50/nv50_program.c b/src/gallium/drivers/nv50/nv50_program.c index 4b05075..caf03c9 100644 --- a/src/gallium/drivers/nv50/nv50_program.c +++ b/src/gallium/drivers/nv50/nv50_program.c @@ -28,11 +28,12 @@ #include "pipe/p_shader_tokens.h" #include "tgsi/tgsi_parse.h" #include "tgsi/tgsi_util.h" +#include "tgsi/tgsi_dump.h" #include "nv50_context.h" #define NV50_SU_MAX_TEMP 64 -//#define NV50_PROGRAM_DUMP +/* #define NV50_PROGRAM_DUMP */ /* ARL - gallium craps itself on progs...

Hi ! I've been trying to improve NV50 shader generation a bit the last couple of weeks, so here is what I've produced. I don't know if it's usable for you or just a pile of horrible hacks, but at least it makes some mesa demos render more correcly, p.e. the teapot (aside from mip-mapping issues of the floor texture), arbfplight, and I think the gears also didn't appear as they