fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-01-29 00:50:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

i965/wm: use proper API buffer size for the surfaces.

Browse source 
Commit 5bb5eeea fixes a bug indicating that the surfaces should have the
API buffer size. Hovewer it picked the wrong value.

This patch adds a new variable, which takes into account
glBindBufferRange() values. This patch fixes the following CTS
regressions:

ES31-CTS.shader_storage_buffer_object.advanced-unsizedArrayLength-cs-std430-vec-bindrangeOffset
ES31-CTS.shader_storage_buffer_object.advanced-unsizedArrayLength-cs-std430-vec-bindrangeSize

Signed-off-by: Samuel Iglesias Gonsálvez <siglesias@igalia.com>
Reviewed-by: Marta Lofstedt <marta.lofstedt@intel.com>
This commit is contained in:
Samuel Iglesias Gonsálvez 2015-12-15 12:51:48 +01:00
parent 86fa48426c
commit 8cf2e892fc
4 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/mesa/drivers/dri/i965/brw_wm_surface_state.c
View file

@ -946,12 +946,14 @@ brw_upload_ubo_surfaces(struct brw_context *brw,
} else { } else {
struct intel_buffer_object *intel_bo = struct intel_buffer_object *intel_bo =
intel_buffer_object(binding->BufferObject); intel_buffer_object(binding->BufferObject);
GLsizeiptrARB size = MIN2(binding->BufferObject->BufferRangeSize,
binding->BufferObject->Size - binding->Offset);
drm_intel_bo *bo = drm_intel_bo *bo =
intel_bufferobj_buffer(brw, intel_bo, intel_bufferobj_buffer(brw, intel_bo,
binding->Offset, binding->Offset,
binding->BufferObject->Size - binding->Offset); size);
brw_create_constant_surface(brw, bo, binding->Offset, brw_create_constant_surface(brw, bo, binding->Offset,
binding->BufferObject->Size - binding->Offset, size,
&ubo_surf_offsets[i]); &ubo_surf_offsets[i]);
} }
} }
@ -968,12 +970,14 @@ brw_upload_ubo_surfaces(struct brw_context *brw,
} else { } else {
struct intel_buffer_object *intel_bo = struct intel_buffer_object *intel_bo =
intel_buffer_object(binding->BufferObject); intel_buffer_object(binding->BufferObject);
GLsizeiptrARB size = MIN2(binding->BufferObject->BufferRangeSize,
binding->BufferObject->Size - binding->Offset);
drm_intel_bo *bo = drm_intel_bo *bo =
intel_bufferobj_buffer(brw, intel_bo, intel_bufferobj_buffer(brw, intel_bo,
binding->Offset, binding->Offset,
binding->BufferObject->Size - binding->Offset); size);
brw_create_buffer_surface(brw, bo, binding->Offset, brw_create_buffer_surface(brw, bo, binding->Offset,
binding->BufferObject->Size - binding->Offset, size,
&ssbo_surf_offsets[i]); &ssbo_surf_offsets[i]);
} }
} }

1
src/mesa/drivers/dri/i965/intel_buffer_objects.c
View file

@ -198,6 +198,7 @@ brw_buffer_data(struct gl_context *ctx,
(void) target; (void) target;
intel_obj->Base.Size = size; intel_obj->Base.Size = size;
intel_obj->Base.BufferRangeSize = size;
intel_obj->Base.Usage = usage; intel_obj->Base.Usage = usage;
intel_obj->Base.StorageFlags = storageFlags; intel_obj->Base.StorageFlags = storageFlags;

4
src/mesa/main/bufferobj.c
View file

@ -43,7 +43,7 @@
#include "glformats.h" #include "glformats.h"
#include "texstore.h" #include "texstore.h"
#include "transformfeedback.h" #include "transformfeedback.h"
#include "macros.h"
/* Debug flags */ /* Debug flags */
/*#define VBO_DEBUG*/ /*#define VBO_DEBUG*/
@ -2840,6 +2840,7 @@ bind_buffer_range_uniform_buffer(struct gl_context *ctx,
_mesa_reference_buffer_object(ctx, &ctx->UniformBuffer, bufObj); _mesa_reference_buffer_object(ctx, &ctx->UniformBuffer, bufObj);
bind_uniform_buffer(ctx, index, bufObj, offset, size, GL_FALSE); bind_uniform_buffer(ctx, index, bufObj, offset, size, GL_FALSE);
bufObj->BufferRangeSize = MIN2(size, bufObj->Size);
} }
/** /**
@ -2875,6 +2876,7 @@ bind_buffer_range_shader_storage_buffer(struct gl_context *ctx,
_mesa_reference_buffer_object(ctx, &ctx->ShaderStorageBuffer, bufObj); _mesa_reference_buffer_object(ctx, &ctx->ShaderStorageBuffer, bufObj);
bind_shader_storage_buffer(ctx, index, bufObj, offset, size, GL_FALSE); bind_shader_storage_buffer(ctx, index, bufObj, offset, size, GL_FALSE);
bufObj->BufferRangeSize = MIN2(size, bufObj->Size);
} }
/** /**

1
src/mesa/main/mtypes.h
View file

@ -1268,6 +1268,7 @@ struct gl_buffer_object
GLenum Usage; /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */ GLenum Usage; /**< GL_STREAM_DRAW_ARB, GL_STREAM_READ_ARB, etc. */
GLbitfield StorageFlags; /**< GL_MAP_PERSISTENT_BIT, etc. */ GLbitfield StorageFlags; /**< GL_MAP_PERSISTENT_BIT, etc. */
GLsizeiptrARB Size; /**< Size of buffer storage in bytes */ GLsizeiptrARB Size; /**< Size of buffer storage in bytes */
GLsizeiptrARB BufferRangeSize; /**< Amount of data that can be read from or written to, in bytes */
GLubyte *Data; /**< Location of storage either in RAM or VRAM. */ GLubyte *Data; /**< Location of storage either in RAM or VRAM. */
GLboolean DeletePending; /**< true if buffer object is removed from the hash */ GLboolean DeletePending; /**< true if buffer object is removed from the hash */
GLboolean Written; /**< Ever written to? (for debugging) */ GLboolean Written; /**< Ever written to? (for debugging) */