r600g: merge the TXQ and BUFFER constant buffers (v1.1)
We are using 1 more buffer than we have, although in the future the driver should just end up using one buffer in total probably, this is a good first step, it merges the txq cube array and buffer info constants on r600 and evergreen. This should in theory fix geom shader tests on r600. v1.1: fix comments from Glenn. Reviewed-by:Glenn Kennard <glenn.kennard@gmail.com> Cc: "10.4 10.3" <mesa-stable@lists.freedesktop.org Signed-off-by:
Dave Airlie <airlied@redhat.com> (cherry picked from commit 07ae6975) Squashed with commit r600g: fix fallout from last patch I accidentally rebased from the wrong machine and missed some fixes that were on my r600 box. doh. this fixes a bunch of geom shader textureSize tests on rv635 from gpu reset to pass. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=86760 Reported-by:
<wolput@onsneteindhoven.nl> Cc: "10.4 10.3" <mesa-stable@lists.freedesktop.org> Signed-off-by:
Dave Airlie <airlied@redhat.com> (cherry picked from commit b10ddf96) Squashed with commit r600g: make llvm code compile this time Actually compiling the code helps make it compile. Cc: "10.3 10.4" <mesa-stable@lists.freedesktop.org> Signed-off-by:
Dave Airlie <airlied@redhat.com> (cherry picked from commit 91a82762)
- src/gallium/drivers/r600/r600_llvm.c 1 addition, 2 deletionssrc/gallium/drivers/r600/r600_llvm.c
- src/gallium/drivers/r600/r600_pipe.h 7 additions, 9 deletionssrc/gallium/drivers/r600/r600_pipe.h
- src/gallium/drivers/r600/r600_shader.c 13 additions, 5 deletionssrc/gallium/drivers/r600/r600_shader.c
- src/gallium/drivers/r600/r600_state_common.c 41 additions, 56 deletionssrc/gallium/drivers/r600/r600_state_common.c