fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 15:38:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

i965: Rename intel_buffer_object to brw_buffer_object

Browse source 
Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9207>
This commit is contained in:
Kenneth Graunke 2021-02-22 11:37:49 -08:00 • committed by Marge Bot
parent b45971e473
commit d2e38c2648
11 changed files with 84 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/drivers/dri/i965/brw_blorp.c
View file

@ -855,10 +855,10 @@ blorp_get_client_bo(struct brw_context *brw,
}
/* This is a user-provided PBO. We just need to get the BO out */
struct intel_buffer_object *intel_pbo =
intel_buffer_object(packing->BufferObj);
struct brw_buffer_object *intel_pbo =
brw_buffer_object(packing->BufferObj);
struct brw_bo *bo =
intel_bufferobj_buffer(brw, intel_pbo, offset, size, !read_only);
brw_bufferobj_buffer(brw, intel_pbo, offset, size, !read_only);
/* We take a reference to the BO so that the caller can just always
* unref without having to worry about whether it's a user PBO or one

6
src/mesa/drivers/dri/i965/brw_compute.c
View file

@ -114,9 +114,9 @@ brw_dispatch_compute_indirect(struct gl_context *ctx, GLintptr indirect)
static const GLuint indirect_group_counts[3] = { 0, 0, 0 };
struct gl_buffer_object *indirect_buffer = ctx->DispatchIndirectBuffer;
struct brw_bo *bo =
intel_bufferobj_buffer(brw,
intel_buffer_object(indirect_buffer),
indirect, 3 * sizeof(GLuint), false);
brw_bufferobj_buffer(brw,
brw_buffer_object(indirect_buffer),
indirect, 3 * sizeof(GLuint), false);
brw->compute.num_work_groups_bo = bo;
brw->compute.num_work_groups_offset = indirect;

8
src/mesa/drivers/dri/i965/brw_draw.c
View file

@ -228,8 +228,8 @@ brw_emit_prim(struct brw_context *brw,
ADVANCE_BATCH();
} else if (is_indirect) {
struct gl_buffer_object *indirect_buffer = brw->ctx.DrawIndirectBuffer;
struct brw_bo *bo = intel_bufferobj_buffer(brw,
intel_buffer_object(indirect_buffer),
struct brw_bo *bo = brw_bufferobj_buffer(brw,
brw_buffer_object(indirect_buffer),
indirect_offset, 5 * sizeof(GLuint), false);
indirect_flag = GEN7_3DPRIM_INDIRECT_PARAMETER_ENABLE;
@ -1052,7 +1052,7 @@ brw_draw_single_prim(struct gl_context *ctx,
if (is_indirect) {
/* Point draw_params_bo at the indirect buffer. */
brw->draw.draw_params_bo =
intel_buffer_object(ctx->DrawIndirectBuffer)->buffer;
brw_buffer_object(ctx->DrawIndirectBuffer)->buffer;
brw_bo_reference(brw->draw.draw_params_bo);
brw->draw.draw_params_offset =
indirect_offset + (is_indexed ? 12 : 8);
@ -1309,7 +1309,7 @@ brw_draw_indirect_prims(struct gl_context *ctx,
if (indirect_params) {
brw->draw.draw_params_count_bo =
intel_buffer_object(indirect_params)->buffer;
brw_buffer_object(indirect_params)->buffer;
brw_bo_reference(brw->draw.draw_params_count_bo);
brw->draw.draw_params_count_offset = indirect_params_offset;
}

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

@ -525,8 +525,8 @@ brw_prepare_vertices(struct brw_context *brw)
}
assert(vertex_range_start <= vertex_range_end);
struct intel_buffer_object *intel_buffer =
intel_buffer_object(glbinding->BufferObj);
struct brw_buffer_object *intel_buffer =
brw_buffer_object(glbinding->BufferObj);
struct brw_vertex_buffer *buffer = &brw->vb.buffers[j];
const uint32_t offset = _mesa_draw_binding_offset(glbinding);
@ -577,8 +577,8 @@ brw_prepare_vertices(struct brw_context *brw)
buffer->stride = stride;
buffer->step_rate = glbinding->InstanceDivisor;
buffer->bo = intel_bufferobj_buffer(brw, intel_buffer, offset + start,
range, false);
buffer->bo = brw_bufferobj_buffer(brw, intel_buffer, offset + start,
range, false);
brw_bo_reference(buffer->bo);
j++;
@ -757,8 +757,8 @@ brw_upload_indices(struct brw_context *brw)
offset = (GLuint) (unsigned long) index_buffer->ptr;
struct brw_bo *bo =
intel_bufferobj_buffer(brw, intel_buffer_object(bufferobj),
offset, ib_size, false);
brw_bufferobj_buffer(brw, brw_buffer_object(bufferobj),
offset, ib_size, false);
if (bo != brw->ib.bo) {
brw_bo_unreference(brw->ib.bo);
brw->ib.bo = bo;

24
src/mesa/drivers/dri/i965/brw_object_purgeable.c
View file

@ -48,11 +48,11 @@ intel_buffer_purgeable(struct brw_bo *buffer)
}
static GLenum
intel_buffer_object_purgeable(struct gl_context * ctx,
struct gl_buffer_object *obj,
GLenum option)
brw_buffer_object_purgeable(struct gl_context * ctx,
struct gl_buffer_object *obj,
GLenum option)
{
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
if (intel_obj->buffer != NULL)
return intel_buffer_purgeable(intel_obj->buffer);
@ -67,8 +67,8 @@ intel_buffer_object_purgeable(struct gl_context * ctx,
static GLenum
brw_texture_object_purgeable(struct gl_context * ctx,
struct gl_texture_object *obj,
GLenum option)
struct gl_texture_object *obj,
GLenum option)
{
struct brw_texture_object *intel;
@ -112,11 +112,11 @@ intel_bo_unpurgeable(struct brw_bo *buffer)
}
static GLenum
intel_buffer_object_unpurgeable(struct gl_context * ctx,
struct gl_buffer_object *obj,
GLenum option)
brw_buffer_object_unpurgeable(struct gl_context * ctx,
struct gl_buffer_object *obj,
GLenum option)
{
struct intel_buffer_object *intel = intel_buffer_object(obj);
struct brw_buffer_object *intel = brw_buffer_object(obj);
(void) ctx;
@ -177,11 +177,11 @@ intel_render_object_unpurgeable(struct gl_context * ctx,
void
brw_init_object_purgeable_functions(struct dd_function_table *functions)
{
functions->BufferObjectPurgeable = intel_buffer_object_purgeable;
functions->BufferObjectPurgeable = brw_buffer_object_purgeable;
functions->TextureObjectPurgeable = brw_texture_object_purgeable;
functions->RenderObjectPurgeable = intel_render_object_purgeable;
functions->BufferObjectUnpurgeable = intel_buffer_object_unpurgeable;
functions->BufferObjectUnpurgeable = brw_buffer_object_unpurgeable;
functions->TextureObjectUnpurgeable = brw_texture_object_unpurgeable;
functions->RenderObjectUnpurgeable = intel_render_object_unpurgeable;
}

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

@ -687,8 +687,8 @@ brw_update_buffer_texture_surface(struct gl_context *ctx,
{
struct brw_context *brw = brw_context(ctx);
struct gl_texture_object *tObj = ctx->Texture.Unit[unit]._Current;
struct intel_buffer_object *intel_obj =
intel_buffer_object(tObj->BufferObject);
struct brw_buffer_object *intel_obj =
brw_buffer_object(tObj->BufferObject);
const unsigned size = buffer_texture_range_size(brw, tObj);
struct brw_bo *bo = NULL;
mesa_format format = tObj->_BufferObjectFormat;
@ -696,8 +696,8 @@ brw_update_buffer_texture_surface(struct gl_context *ctx,
int texel_size = _mesa_get_format_bytes(format);
if (intel_obj)
bo = intel_bufferobj_buffer(brw, intel_obj, tObj->BufferOffset, size,
false);
bo = brw_bufferobj_buffer(brw, intel_obj, tObj->BufferOffset, size,
false);
if (isl_format == ISL_FORMAT_UNSUPPORTED) {
_mesa_problem(NULL, "bad format %s for texture buffer\n",
@ -724,12 +724,12 @@ brw_update_sol_surface(struct brw_context *brw,
uint32_t *out_offset, unsigned num_vector_components,
unsigned stride_dwords, unsigned offset_dwords)
{
struct intel_buffer_object *intel_bo = intel_buffer_object(buffer_obj);
struct brw_buffer_object *intel_bo = brw_buffer_object(buffer_obj);
uint32_t offset_bytes = 4 * offset_dwords;
struct brw_bo *bo = intel_bufferobj_buffer(brw, intel_bo,
offset_bytes,
buffer_obj->Size - offset_bytes,
true);
struct brw_bo *bo = brw_bufferobj_buffer(brw, intel_bo,
offset_bytes,
buffer_obj->Size - offset_bytes,
true);
uint32_t *surf = brw_state_batch(brw, 6 * 4, 32, out_offset);
uint32_t pitch_minus_1 = 4*stride_dwords - 1;
size_t size_dwords = buffer_obj->Size / 4;
@ -1337,11 +1337,11 @@ upload_buffer_surface(struct brw_context *brw,
return;
}
struct intel_buffer_object *iobj =
intel_buffer_object(binding->BufferObject);
struct brw_buffer_object *iobj =
brw_buffer_object(binding->BufferObject);
struct brw_bo *bo =
intel_bufferobj_buffer(brw, iobj, binding->Offset, size,
(reloc_flags & RELOC_WRITE) != 0);
brw_bufferobj_buffer(brw, iobj, binding->Offset, size,
(reloc_flags & RELOC_WRITE) != 0);
brw_emit_buffer_surface_state(brw, out_offset, bo, binding->Offset,
format, size, 1, reloc_flags);
@ -1530,8 +1530,8 @@ update_image_surface(struct brw_context *brw,
_mesa_get_format_bytes(u->_ActualFormat));
const unsigned buffer_size = buffer_texture_range_size(brw, obj);
struct brw_bo *const bo = !obj->BufferObject ? NULL :
intel_bufferobj_buffer(brw, intel_buffer_object(obj->BufferObject),
obj->BufferOffset, buffer_size, written);
brw_bufferobj_buffer(brw, brw_buffer_object(obj->BufferObject),
obj->BufferOffset, buffer_size, written);
brw_emit_buffer_surface_state(
brw, surf_offset, bo, obj->BufferOffset,

10
src/mesa/drivers/dri/i965/genX_state_upload.c
View file

@ -3146,8 +3146,8 @@ genX(upload_push_constant_packets)(struct brw_context *brw)
assert(binding->Offset % 32 == 0);
struct brw_bo *bo = intel_bufferobj_buffer(brw,
intel_buffer_object(binding->BufferObject),
struct brw_bo *bo = brw_bufferobj_buffer(brw,
brw_buffer_object(binding->BufferObject),
binding->Offset, range->length * 32, false);
pkt.ConstantBody.ReadLength[n] = range->length;
@ -3684,8 +3684,8 @@ genX(upload_3dstate_so_buffers)(struct brw_context *brw)
* gl_transform_feedback_object.
*/
for (int i = 0; i < 4; i++) {
struct intel_buffer_object *bufferobj =
intel_buffer_object(xfb_obj->Buffers[i]);
struct brw_buffer_object *bufferobj =
brw_buffer_object(xfb_obj->Buffers[i]);
uint32_t start = xfb_obj->Offset[i];
uint32_t end = ALIGN(start + xfb_obj->Size[i], 4);
uint32_t const size = end - start;
@ -3699,7 +3699,7 @@ genX(upload_3dstate_so_buffers)(struct brw_context *brw)
assert(start % 4 == 0);
struct brw_bo *bo =
intel_bufferobj_buffer(brw, bufferobj, start, size, true);
brw_bufferobj_buffer(brw, bufferobj, start, size, true);
assert(end <= bo->size);
brw_batch_emit(brw, GENX(3DSTATE_SO_BUFFER), sob) {

2
src/mesa/drivers/dri/i965/hsw_queryobj.c
View file

@ -436,7 +436,7 @@ hsw_store_query_result(struct gl_context *ctx, struct gl_query_object *q,
{
struct brw_context *brw = brw_context(ctx);
struct brw_query_object *query = (struct brw_query_object *)q;
struct intel_buffer_object *bo = intel_buffer_object(buf);
struct brw_buffer_object *bo = brw_buffer_object(buf);
const bool pipelined = brw_is_query_pipelined(query);
if (pname == GL_QUERY_TARGET) {

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

@ -24,7 +24,7 @@
*/
/**
* @file intel_buffer_objects.c
* @file brw_buffer_objects.c
*
* This provides core GL buffer object functionality.
*/
@ -42,7 +42,7 @@
#include "intel_batchbuffer.h"
static void
mark_buffer_gpu_usage(struct intel_buffer_object *intel_obj,
mark_buffer_gpu_usage(struct brw_buffer_object *intel_obj,
uint32_t offset, uint32_t size)
{
intel_obj->gpu_active_start = MIN2(intel_obj->gpu_active_start, offset);
@ -50,14 +50,14 @@ mark_buffer_gpu_usage(struct intel_buffer_object *intel_obj,
}
static void
mark_buffer_inactive(struct intel_buffer_object *intel_obj)
mark_buffer_inactive(struct brw_buffer_object *intel_obj)
{
intel_obj->gpu_active_start = ~0;
intel_obj->gpu_active_end = 0;
}
static void
mark_buffer_valid_data(struct intel_buffer_object *intel_obj,
mark_buffer_valid_data(struct brw_buffer_object *intel_obj,
uint32_t offset, uint32_t size)
{
intel_obj->valid_data_start = MIN2(intel_obj->valid_data_start, offset);
@ -65,7 +65,7 @@ mark_buffer_valid_data(struct intel_buffer_object *intel_obj,
}
static void
mark_buffer_invalid(struct intel_buffer_object *intel_obj)
mark_buffer_invalid(struct brw_buffer_object *intel_obj)
{
intel_obj->valid_data_start = ~0;
intel_obj->valid_data_end = 0;
@ -74,7 +74,7 @@ mark_buffer_invalid(struct intel_buffer_object *intel_obj)
/** Allocates a new brw_bo to store the data for the buffer object. */
static void
alloc_buffer_object(struct brw_context *brw,
struct intel_buffer_object *intel_obj)
struct brw_buffer_object *intel_obj)
{
const struct gl_context *ctx = &brw->ctx;
@ -114,7 +114,7 @@ alloc_buffer_object(struct brw_context *brw,
}
static void
release_buffer(struct intel_buffer_object *intel_obj)
release_buffer(struct brw_buffer_object *intel_obj)
{
brw_bo_unreference(intel_obj->buffer);
intel_obj->buffer = NULL;
@ -123,7 +123,7 @@ release_buffer(struct intel_buffer_object *intel_obj)
/**
* The NewBufferObject() driver hook.
*
* Allocates a new intel_buffer_object structure and initializes it.
* Allocates a new brw_buffer_object structure and initializes it.
*
* There is some duplication between mesa's bufferobjects and our
* bufmgr buffers. Both have an integer handle and a hashtable to
@ -133,7 +133,7 @@ release_buffer(struct intel_buffer_object *intel_obj)
static struct gl_buffer_object *
brw_new_buffer_object(struct gl_context * ctx, GLuint name)
{
struct intel_buffer_object *obj = CALLOC_STRUCT(intel_buffer_object);
struct brw_buffer_object *obj = CALLOC_STRUCT(brw_buffer_object);
if (!obj) {
_mesa_error_no_memory(__func__);
return NULL;
@ -154,7 +154,7 @@ brw_new_buffer_object(struct gl_context * ctx, GLuint name)
static void
brw_delete_buffer(struct gl_context * ctx, struct gl_buffer_object *obj)
{
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
assert(intel_obj);
@ -189,7 +189,7 @@ brw_buffer_data(struct gl_context *ctx,
struct gl_buffer_object *obj)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
/* Part of the ABI, but this function doesn't use it.
*/
@ -237,7 +237,7 @@ brw_buffer_subdata(struct gl_context *ctx,
struct gl_buffer_object *obj)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
bool busy;
if (size == 0)
@ -335,7 +335,7 @@ brw_get_buffer_subdata(struct gl_context *ctx,
GLvoid *data,
struct gl_buffer_object *obj)
{
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
struct brw_context *brw = brw_context(ctx);
assert(intel_obj);
@ -393,7 +393,7 @@ brw_map_buffer_range(struct gl_context *ctx,
gl_map_buffer_index index)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
assert(intel_obj);
@ -500,7 +500,7 @@ brw_flush_mapped_buffer_range(struct gl_context *ctx,
gl_map_buffer_index index)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
assert(obj->Mappings[index].AccessFlags & GL_MAP_FLUSH_EXPLICIT_BIT);
@ -560,7 +560,7 @@ brw_unmap_buffer(struct gl_context *ctx,
gl_map_buffer_index index)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_obj = intel_buffer_object(obj);
struct brw_buffer_object *intel_obj = brw_buffer_object(obj);
assert(intel_obj);
assert(obj->Mappings[index].Pointer);
@ -604,9 +604,9 @@ brw_unmap_buffer(struct gl_context *ctx,
* mark the range of the buffer that is being accessed by the pipeline.
*/
struct brw_bo *
intel_bufferobj_buffer(struct brw_context *brw,
struct intel_buffer_object *intel_obj,
uint32_t offset, uint32_t size, bool write)
brw_bufferobj_buffer(struct brw_context *brw,
struct brw_buffer_object *intel_obj,
uint32_t offset, uint32_t size, bool write)
{
/* This is needed so that things like transform feedback and texture buffer
* objects that need a BO but don't want to check that they exist for
@ -639,15 +639,15 @@ brw_copy_buffer_subdata(struct gl_context *ctx,
GLsizeiptr size)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *intel_src = intel_buffer_object(src);
struct intel_buffer_object *intel_dst = intel_buffer_object(dst);
struct brw_buffer_object *intel_src = brw_buffer_object(src);
struct brw_buffer_object *intel_dst = brw_buffer_object(dst);
struct brw_bo *src_bo, *dst_bo;
if (size == 0)
return;
dst_bo = intel_bufferobj_buffer(brw, intel_dst, write_offset, size, true);
src_bo = intel_bufferobj_buffer(brw, intel_src, read_offset, size, false);
dst_bo = brw_bufferobj_buffer(brw, intel_dst, write_offset, size, true);
src_bo = brw_bufferobj_buffer(brw, intel_src, read_offset, size, false);
brw_blorp_copy_buffers(brw,
src_bo, read_offset,

18
src/mesa/drivers/dri/i965/intel_buffer_objects.h
View file

@ -35,7 +35,7 @@ struct gl_buffer_object;
/**
* Intel vertex/pixel buffer object, derived from Mesa's gl_buffer_object.
*/
struct intel_buffer_object
struct brw_buffer_object
{
struct gl_buffer_object Base;
struct brw_bo *buffer; /* the low-level buffer manager's buffer handle */
@ -93,11 +93,11 @@ struct intel_buffer_object
/* Get the bm buffer associated with a GL bufferobject:
*/
struct brw_bo *intel_bufferobj_buffer(struct brw_context *brw,
struct intel_buffer_object *obj,
uint32_t offset,
uint32_t size,
bool write);
struct brw_bo *brw_bufferobj_buffer(struct brw_context *brw,
struct brw_buffer_object *obj,
uint32_t offset,
uint32_t size,
bool write);
void brw_upload_data(struct brw_uploader *upload,
const void *data,
@ -121,10 +121,10 @@ void brw_upload_init(struct brw_uploader *upload,
*/
void intelInitBufferObjectFuncs(struct dd_function_table *functions);
static inline struct intel_buffer_object *
intel_buffer_object(struct gl_buffer_object *obj)
static inline struct brw_buffer_object *
brw_buffer_object(struct gl_buffer_object *obj)
{
return (struct intel_buffer_object *) obj;
return (struct brw_buffer_object *) obj;
}
#endif

6
src/mesa/drivers/dri/i965/intel_pixel_draw.c
View file

@ -55,7 +55,7 @@ do_blit_drawpixels(struct gl_context * ctx,
const GLvoid * pixels)
{
struct brw_context *brw = brw_context(ctx);
struct intel_buffer_object *src = intel_buffer_object(unpack->BufferObj);
struct brw_buffer_object *src = brw_buffer_object(unpack->BufferObj);
GLuint src_offset;
struct brw_bo *src_buffer;
@ -108,8 +108,8 @@ do_blit_drawpixels(struct gl_context * ctx,
src_offset += _mesa_image_offset(2, unpack, width, height,
format, type, 0, 0, 0);
src_buffer = intel_bufferobj_buffer(brw, src, src_offset,
height * src_stride, false);
src_buffer = brw_bufferobj_buffer(brw, src, src_offset,
height * src_stride, false);
struct brw_mipmap_tree *pbo_mt =
brw_miptree_create_for_bo(brw,