From 36385c0bdfe8883aa9a0ff27cd6d04a2ec753344 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Tue, 14 May 2013 16:55:56 +0100 Subject: [PATCH] mesa/st: Temporary workaround for fdo bug 64568. Effectively reverting the problematic hunk of commit 614ee25077b7ffafeb87b22563d01856824fb4bc --- src/mesa/state_tracker/st_extensions.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index b64d363d349..982e652f1b0 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 } } -- 2.30.2