From a1d664a0b7dbd8bbab0ff7a179e8960c25a52c0b Mon Sep 17 00:00:00 2001 From: Ilia Mirkin Date: Mon, 4 Jan 2016 19:48:08 -0500 Subject: Revert "i965/wm: use proper API buffer size for the surfaces." MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 8cf2e892fca20c4776b4a07c39918343cb2d4e0e. It's entirely bogus to attempt to store anything about the binding in the buffer object itself, which might be bound any number of times. Signed-off-by: Ilia Mirkin Cc: Samuel Iglesias Gonsálvez Cc: Marta Lofstedt Reviewed-by: Samuel Iglesias Gonsálvez --- src/mesa/main/bufferobj.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'src/mesa/main/bufferobj.c') diff --git a/src/mesa/main/bufferobj.c b/src/mesa/main/bufferobj.c index 8a9f9b6..3a05cd5 100644 --- a/src/mesa/main/bufferobj.c +++ b/src/mesa/main/bufferobj.c @@ -43,7 +43,7 @@ #include "glformats.h" #include "texstore.h" #include "transformfeedback.h" -#include "macros.h" + /* Debug flags */ /*#define VBO_DEBUG*/ @@ -2840,7 +2840,6 @@ bind_buffer_range_uniform_buffer(struct gl_context *ctx, _mesa_reference_buffer_object(ctx, &ctx->UniformBuffer, bufObj); bind_uniform_buffer(ctx, index, bufObj, offset, size, GL_FALSE); - bufObj->BufferRangeSize = MIN2(size, bufObj->Size); } /** @@ -2876,7 +2875,6 @@ bind_buffer_range_shader_storage_buffer(struct gl_context *ctx, _mesa_reference_buffer_object(ctx, &ctx->ShaderStorageBuffer, bufObj); bind_shader_storage_buffer(ctx, index, bufObj, offset, size, GL_FALSE); - bufObj->BufferRangeSize = MIN2(size, bufObj->Size); } /** -- cgit v1.1