mesa/st: Temporary workaround for fdo bug 64568.
Effectively reverting the problematic hunk of
commit 614ee25077
This commit is contained in:
@@ -279,10 +279,15 @@ void st_init_limits(struct st_context *st)
|
|||||||
st->ctx->Extensions.ARB_uniform_buffer_object = GL_TRUE;
|
st->ctx->Extensions.ARB_uniform_buffer_object = GL_TRUE;
|
||||||
c->UniformBufferOffsetAlignment =
|
c->UniformBufferOffsetAlignment =
|
||||||
screen->get_param(screen, PIPE_CAP_CONSTANT_BUFFER_OFFSET_ALIGNMENT);
|
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->MaxCombinedUniformBlocks = c->MaxUniformBufferBindings =
|
||||||
c->VertexProgram.MaxUniformBlocks +
|
c->VertexProgram.MaxUniformBlocks +
|
||||||
c->GeometryProgram.MaxUniformBlocks +
|
c->GeometryProgram.MaxUniformBlocks +
|
||||||
c->FragmentProgram.MaxUniformBlocks;
|
c->FragmentProgram.MaxUniformBlocks;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user