Re: [Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Ilia Mirkin
Ah yes, my bad. I did try to look at all the stuff, but it doesn't help that e.g. the texture man page is wrong for samplerCubeShadow (http://www.opengl.org/sdk/docs/man/html/texture.xhtml -- it lists the argument as vec3... I did double-check in the GL 4.4 spec, and it's correct there with a vec4)

Re: [Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Marek Olšák
samplerCubeArrayShadow cannot be used with lod and bias in GLSL 4.40, so it's impossible to get TXL or TXB with it. Some sampler types are more limited than others. For example, samplerCubeArrayShadow can only be used with this: float texture(gsamplerCubeArrayShadow sampler, vec4 P, float compare

Re: [Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Ilia Mirkin
On Fri, Jul 4, 2014 at 3:30 PM, Ilia Mirkin wrote: > On Fri, Jul 4, 2014 at 2:49 PM, Ilia Mirkin wrote: >> On Fri, Jul 4, 2014 at 8:10 AM, Marek Olšák wrote: >>> From: Marek Olšák >>> >>> It has 5 coordinates: (x,y,z,depth,lodbias) >>> >>> Cc: mesa-sta...@lists.freedesktop.org >> >> Reviewed-by

Re: [Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Ilia Mirkin
On Fri, Jul 4, 2014 at 2:49 PM, Ilia Mirkin wrote: > On Fri, Jul 4, 2014 at 8:10 AM, Marek Olšák wrote: >> From: Marek Olšák >> >> It has 5 coordinates: (x,y,z,depth,lodbias) >> >> Cc: mesa-sta...@lists.freedesktop.org > > Reviewed-by: Ilia Mirkin > > Although I still haven't worked out what el

Re: [Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Ilia Mirkin
On Fri, Jul 4, 2014 at 8:10 AM, Marek Olšák wrote: > From: Marek Olšák > > It has 5 coordinates: (x,y,z,depth,lodbias) > > Cc: mesa-sta...@lists.freedesktop.org Reviewed-by: Ilia Mirkin Although I still haven't worked out what else is wrong with nouveau... nv50 hits an assert, while nvc0 just

[Mesa-dev] [PATCH 1/2] st/mesa: fix samplerCubeShadow with bias

2014-07-04 Thread Marek Olšák
From: Marek Olšák It has 5 coordinates: (x,y,z,depth,lodbias) Cc: mesa-sta...@lists.freedesktop.org --- src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_g