From: José Fonseca <jfonseca@vmware.com>
Date: Tue, 14 May 2013 15:55:56 +0000 (+0100)
Subject: mesa/st: Temporary workaround for fdo bug 64568.
X-Git-Tag: mesa-9.2.1~1185
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=36385c0bdfe8883aa9a0ff27cd6d04a2ec753344;p=platform%2Fupstream%2Fmesa.git

mesa/st: Temporary workaround for fdo bug 64568.

Effectively reverting the problematic hunk of
commit 614ee25077b7ffafeb87b22563d01856824fb4bc
---

diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index b64d363..982e652 100644
--- a/src/mesa/state_tracker/st_extensions.c
+++ b/src/mesa/state_tracker/st_extensions.c
@@ -279,10 +279,15 @@ void st_init_limits(struct st_context *st)
       st->ctx->Extensions.ARB_uniform_buffer_object = GL_TRUE;
       c->UniformBufferOffsetAlignment =
          screen->get_param(screen, PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT);
+      /* FIXME: _mesa_init_buffer_objects() already has been, and
+       * ctx->UniformBufferBindings allocated, so unfortunately we can't just
+       * change MaxUniformBufferBindings a posteriori. */
+#if 0
       c->MaxCombinedUniformBlocks = c->MaxUniformBufferBindings =
          c->VertexProgram.MaxUniformBlocks +
          c->GeometryProgram.MaxUniformBlocks +
          c->FragmentProgram.MaxUniformBlocks;
+#endif
    }
 }