Mesa (master): nv50: disable stream output before reconfiguring it

[Christoph Bumiller]

Module: Mesa
Branch: master
Commit: 169a0ae40aed27e3f61ac5989b05f0014dab6525
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=169a0ae40aed27e3f61ac5989b05f0014dab6525

Author: Christoph Bumiller <e0425955 at student.tuwien.ac.at>
Date:   Thu Jun 14 23:30:49 2012 +0200

nv50: disable stream output before reconfiguring it

If we don't, the GPU will just throw an ILLEGAL_OPERATION error.

---

 src/gallium/drivers/nv50/nv50_shader_state.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/drivers/nv50/nv50_shader_state.c b/src/gallium/drivers/nv50/nv50_shader_state.c
index df6764b..1ddcd3c 100644
--- a/src/gallium/drivers/nv50/nv50_shader_state.c
+++ b/src/gallium/drivers/nv50/nv50_shader_state.c
@@ -552,9 +552,9 @@ nv50_stream_output_validate(struct nv50_context *nv50)
 
    so = nv50->gmtyprog ? nv50->gmtyprog->so : nv50->vertprog->so;
 
+   BEGIN_NV04(push, NV50_3D(STRMOUT_ENABLE), 1);
+   PUSH_DATA (push, 0);
    if (!so || !nv50->num_so_targets) {
-      BEGIN_NV04(push, NV50_3D(STRMOUT_ENABLE), 1);
-      PUSH_DATA (push, 0);
       if (nv50->screen->base.class_3d < NVA0_3D_CLASS) {
          BEGIN_NV04(push, NV50_3D(STRMOUT_PRIMITIVE_LIMIT), 1);
          PUSH_DATA (push, 0);