summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJosé Fonseca <jfonseca@vmware.com>2013-05-14 16:55:56 +0100
committerJosé Fonseca <jfonseca@vmware.com>2013-05-14 17:02:53 +0100
commit36385c0bdfe8883aa9a0ff27cd6d04a2ec753344 (patch)
treec27bff026ca4a5532b2fecd4362fdb18b75901cd /src
parent29b8d6a1dad71dd70797c356a96d038ad2674d5d (diff)
mesa/st: Temporary workaround for fdo bug 64568.
Effectively reverting the problematic hunk of commit 614ee25077b7ffafeb87b22563d01856824fb4bc
Diffstat (limited to 'src')
-rw-r--r--src/mesa/state_tracker/st_extensions.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c
index b64d363d34..982e652f1b 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
}
}