KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

i965: Rename some camel-case local variables 

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 16:05:49 -08:00 committed by Marge Bot
parent 24a5fb7b84
commit 7ce41b80cb
8 changed files with 93 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/mesa/drivers/dri/i965/intel_mipmap_tree.c
View File

@ -1082,8 +1082,8 @@ bool
brw_miptree_match_image(struct brw_mipmap_tree *mt,
struct gl_texture_image *image)
{
struct brw_texture_image *intelImage = brw_texture_image(image);
GLuint level = intelImage->base.Base.Level;
struct brw_texture_image *brw_image = brw_texture_image(image);
GLuint level = brw_image->base.Base.Level;
int width, height, depth;
/* glTexImage* choose the texture object based on the target passed in, and
@ -1362,35 +1362,35 @@ brw_miptree_copy_slice(struct brw_context *brw,
*/
void
brw_miptree_copy_teximage(struct brw_context *brw,
struct brw_texture_image *intelImage,
struct brw_texture_image *brw_image,
struct brw_mipmap_tree *dst_mt)
{
struct brw_mipmap_tree *src_mt = intelImage->mt;
struct brw_mipmap_tree *src_mt = brw_image->mt;
struct brw_texture_object *intel_obj =
brw_texture_object(intelImage->base.Base.TexObject);
int level = intelImage->base.Base.Level;
const unsigned face = intelImage->base.Base.Face;
brw_texture_object(brw_image->base.Base.TexObject);
int level = brw_image->base.Base.Level;
const unsigned face = brw_image->base.Base.Face;
unsigned start_layer, end_layer;
if (intel_obj->base.Target == GL_TEXTURE_1D_ARRAY) {
assert(face == 0);
assert(intelImage->base.Base.Height);
assert(brw_image->base.Base.Height);
start_layer = 0;
end_layer = intelImage->base.Base.Height - 1;
end_layer = brw_image->base.Base.Height - 1;
} else if (face > 0) {
start_layer = face;
end_layer = face;
} else {
assert(intelImage->base.Base.Depth);
assert(brw_image->base.Base.Depth);
start_layer = 0;
end_layer = intelImage->base.Base.Depth - 1;
end_layer = brw_image->base.Base.Depth - 1;
}
for (unsigned i = start_layer; i <= end_layer; i++) {
brw_miptree_copy_slice(brw, src_mt, level, i, dst_mt, level, i);
}
brw_miptree_reference(&intelImage->mt, dst_mt);
brw_miptree_reference(&brw_image->mt, dst_mt);
intel_obj->needs_validate = true;
}

2
src/mesa/drivers/dri/i965/intel_mipmap_tree.h
View File

@ -481,7 +481,7 @@ brw_miptree_copy_slice(struct brw_context *brw,
void
brw_miptree_copy_teximage(struct brw_context *brw,
struct brw_texture_image *intelImage,
struct brw_texture_image *brw_image,
struct brw_mipmap_tree *dst_mt);
/**

43
src/mesa/drivers/dri/i965/intel_screen.c
View File

@ -2896,14 +2896,13 @@ intelAllocateBuffer(__DRIscreen *dri_screen,
unsigned attachment, unsigned format,
int width, int height)
{
struct brw_buffer *intelBuffer;
struct brw_screen *screen = dri_screen->driverPrivate;
assert(attachment == __DRI_BUFFER_FRONT_LEFT ||
attachment == __DRI_BUFFER_BACK_LEFT);
intelBuffer = calloc(1, sizeof *intelBuffer);
if (intelBuffer == NULL)
struct brw_buffer *buffer = calloc(1, sizeof *buffer);
if (buffer == NULL)
return NULL;
/* The front and back buffers are color buffers, which are X tiled. GEN9+
@ -2911,36 +2910,36 @@ intelAllocateBuffer(__DRIscreen *dri_screen,
* through to here. */
uint32_t pitch;
int cpp = format / 8;
intelBuffer->bo = brw_bo_alloc_tiled_2d(screen->bufmgr,
"intelAllocateBuffer",
width,
height,
cpp,
BRW_MEMZONE_OTHER,
I915_TILING_X, &pitch,
BO_ALLOC_BUSY);
buffer->bo = brw_bo_alloc_tiled_2d(screen->bufmgr,
"intelAllocateBuffer",
width,
height,
cpp,
BRW_MEMZONE_OTHER,
I915_TILING_X, &pitch,
BO_ALLOC_BUSY);
if (intelBuffer->bo == NULL) {
free(intelBuffer);
if (buffer->bo == NULL) {
free(buffer);
return NULL;
}
brw_bo_flink(intelBuffer->bo, &intelBuffer->base.name);
brw_bo_flink(buffer->bo, &buffer->base.name);
intelBuffer->base.attachment = attachment;
intelBuffer->base.cpp = cpp;
intelBuffer->base.pitch = pitch;
buffer->base.attachment = attachment;
buffer->base.cpp = cpp;
buffer->base.pitch = pitch;
return &intelBuffer->base;
return &buffer->base;
}
static void
intelReleaseBuffer(UNUSED __DRIscreen *dri_screen, __DRIbuffer *buffer)
intelReleaseBuffer(UNUSED __DRIscreen *dri_screen, __DRIbuffer *_buffer)
{
struct brw_buffer *intelBuffer = (struct brw_buffer *) buffer;
struct brw_buffer *buffer = (struct brw_buffer *) _buffer;
brw_bo_unreference(intelBuffer->bo);
free(intelBuffer);
brw_bo_unreference(buffer->bo);
free(buffer);
}
static const struct __DriverAPIRec brw_driver_api = {

8
src/mesa/drivers/dri/i965/intel_tex.c
View File

@ -53,9 +53,9 @@ static void
intelDeleteTextureObject(struct gl_context *ctx,
struct gl_texture_object *texObj)
{
struct brw_texture_object *intelObj = brw_texture_object(texObj);
struct brw_texture_object *brw_obj = brw_texture_object(texObj);
brw_miptree_release(&intelObj->mt);
brw_miptree_release(&brw_obj->mt);
_mesa_delete_texture_object(ctx, texObj);
}
@ -187,11 +187,11 @@ static void
brw_free_texture_image_buffer(struct gl_context * ctx,
struct gl_texture_image *texImage)
{
struct brw_texture_image *intelImage = brw_texture_image(texImage);
struct brw_texture_image *brw_image = brw_texture_image(texImage);
DBG("%s\n", __func__);
brw_miptree_release(&intelImage->mt);
brw_miptree_release(&brw_image->mt);
_swrast_free_texture_image_buffer(ctx, texImage);
}

4
src/mesa/drivers/dri/i965/intel_tex.h
View File

@ -48,8 +48,8 @@ void intelReleaseTexBuffer(__DRIcontext *pDRICtx, GLint target,
struct brw_mipmap_tree *
brw_miptree_create_for_teximage(struct brw_context *brw,
struct brw_texture_object *intelObj,
struct brw_texture_image *intelImage,
struct brw_texture_object *brw_obj,
struct brw_texture_image *brw_image,
enum brw_miptree_create_flags flags);
void brw_finalize_mipmap_tree(struct brw_context *brw,

28
src/mesa/drivers/dri/i965/intel_tex_image.c
View File

@ -50,17 +50,17 @@ get_base_dim(unsigned old_base_dim, unsigned new_level_dim, unsigned level)
*/
struct brw_mipmap_tree *
brw_miptree_create_for_teximage(struct brw_context *brw,
struct brw_texture_object *intelObj,
struct brw_texture_image *intelImage,
struct brw_texture_object *brw_obj,
struct brw_texture_image *brw_image,
enum brw_miptree_create_flags flags)
{
GLuint lastLevel;
int width, height, depth;
unsigned old_width = 0, old_height = 0, old_depth = 0;
const struct brw_mipmap_tree *old_mt = intelObj->mt;
const unsigned level = intelImage->base.Base.Level;
const struct brw_mipmap_tree *old_mt = brw_obj->mt;
const unsigned level = brw_image->base.Base.Level;
brw_get_image_dims(&intelImage->base.Base, &width, &height, &depth);
brw_get_image_dims(&brw_image->base.Base, &width, &height, &depth);
if (old_mt) {
old_width = old_mt->surf.logical_level0_px.width;
@ -73,7 +73,7 @@ brw_miptree_create_for_teximage(struct brw_context *brw,
DBG("%s\n", __func__);
/* Figure out image dimensions at start level. */
switch(intelObj->base.Target) {
switch(brw_obj->base.Target) {
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
case GL_TEXTURE_RECTANGLE:
@ -105,25 +105,25 @@ brw_miptree_create_for_teximage(struct brw_context *brw,
* resizable buffers, or require that buffers implement lazy
* pagetable arrangements.
*/
if ((intelObj->base.Sampler.Attrib.MinFilter == GL_NEAREST ||
intelObj->base.Sampler.Attrib.MinFilter == GL_LINEAR) &&
intelImage->base.Base.Level == 0 &&
!intelObj->base.Attrib.GenerateMipmap) {
if ((brw_obj->base.Sampler.Attrib.MinFilter == GL_NEAREST ||
brw_obj->base.Sampler.Attrib.MinFilter == GL_LINEAR) &&
brw_image->base.Base.Level == 0 &&
!brw_obj->base.Attrib.GenerateMipmap) {
lastLevel = 0;
} else {
lastLevel = _mesa_get_tex_max_num_levels(intelObj->base.Target,
lastLevel = _mesa_get_tex_max_num_levels(brw_obj->base.Target,
width, height, depth) - 1;
}
return brw_miptree_create(brw,
intelObj->base.Target,
intelImage->base.Base.TexFormat,
brw_obj->base.Target,
brw_image->base.Base.TexFormat,
0,
lastLevel,
width,
height,
depth,
MAX2(intelImage->base.Base.NumSamples, 1),
MAX2(brw_image->base.Base.NumSamples, 1),
flags);
}

4
src/mesa/drivers/dri/i965/intel_tex_obj.h
View File

@ -75,8 +75,8 @@ struct brw_texture_image
{
struct swrast_texture_image base;
/* If intelImage->mt != NULL, image data is stored here.
* Else if intelImage->base.Buffer != NULL, image is stored there.
/* If brw_image->mt != NULL, image data is stored here.
* Else if brw_image->base.Buffer != NULL, image is stored there.
* Else there is no image data.
*/
struct brw_mipmap_tree *mt;

74
src/mesa/drivers/dri/i965/intel_tex_validate.c
View File

@ -45,15 +45,15 @@ static void
brw_update_max_level(struct gl_texture_object *tObj,
struct gl_sampler_object *sampler)
{
struct brw_texture_object *intelObj = brw_texture_object(tObj);
struct brw_texture_object *brw_obj = brw_texture_object(tObj);
if (!tObj->_MipmapComplete ||
(tObj->_RenderToTexture &&
(sampler->Attrib.MinFilter == GL_NEAREST ||
sampler->Attrib.MinFilter == GL_LINEAR))) {
intelObj->_MaxLevel = tObj->Attrib.BaseLevel;
brw_obj->_MaxLevel = tObj->Attrib.BaseLevel;
} else {
intelObj->_MaxLevel = tObj->_MaxLevel;
brw_obj->_MaxLevel = tObj->_MaxLevel;
}
}
@ -67,7 +67,7 @@ void
brw_finalize_mipmap_tree(struct brw_context *brw,
struct gl_texture_object *tObj)
{
struct brw_texture_object *intelObj = brw_texture_object(tObj);
struct brw_texture_object *brw_obj = brw_texture_object(tObj);
GLuint face, i;
GLuint nr_faces = 0;
struct brw_texture_image *firstImage;
@ -79,15 +79,15 @@ brw_finalize_mipmap_tree(struct brw_context *brw,
/* What levels does this validated texture image require? */
int validate_first_level = tObj->Attrib.BaseLevel;
int validate_last_level = intelObj->_MaxLevel;
int validate_last_level = brw_obj->_MaxLevel;
/* Skip the loop over images in the common case of no images having
* changed. But if the GL_BASE_LEVEL or GL_MAX_LEVEL change to something we
* haven't looked at, then we do need to look at those new images.
*/
if (!intelObj->needs_validate &&
validate_first_level >= intelObj->validated_first_level &&
validate_last_level <= intelObj->validated_last_level) {
if (!brw_obj->needs_validate &&
validate_first_level >= brw_obj->validated_first_level &&
validate_last_level <= brw_obj->validated_last_level) {
return;
}
@ -108,21 +108,21 @@ brw_finalize_mipmap_tree(struct brw_context *brw,
/* Check tree can hold all active levels. Check tree matches
* target, imageFormat, etc.
*/
if (intelObj->mt &&
(!brw_miptree_match_image(intelObj->mt, &firstImage->base.Base) ||
validate_first_level < intelObj->mt->first_level ||
validate_last_level > intelObj->mt->last_level)) {
brw_miptree_release(&intelObj->mt);
if (brw_obj->mt &&
(!brw_miptree_match_image(brw_obj->mt, &firstImage->base.Base) ||
validate_first_level < brw_obj->mt->first_level ||
validate_last_level > brw_obj->mt->last_level)) {
brw_miptree_release(&brw_obj->mt);
}
/* May need to create a new tree:
*/
if (!intelObj->mt) {
if (!brw_obj->mt) {
const unsigned level = firstImage->base.Base.Level;
brw_get_image_dims(&firstImage->base.Base, &width, &height, &depth);
/* Figure out image dimensions at start level. */
switch(intelObj->base.Target) {
switch(brw_obj->base.Target) {
case GL_TEXTURE_2D_MULTISAMPLE:
case GL_TEXTURE_2D_MULTISAMPLE_ARRAY:
case GL_TEXTURE_RECTANGLE:
@ -150,46 +150,46 @@ brw_finalize_mipmap_tree(struct brw_context *brw,
_mesa_get_format_name(firstImage->base.Base.TexFormat),
width, height, depth, validate_last_level + 1);
intelObj->mt = brw_miptree_create(brw,
intelObj->base.Target,
firstImage->base.Base.TexFormat,
0, /* first_level */
validate_last_level,
width,
height,
depth,
1 /* num_samples */,
MIPTREE_CREATE_BUSY);
if (!intelObj->mt)
brw_obj->mt = brw_miptree_create(brw,
brw_obj->base.Target,
firstImage->base.Base.TexFormat,
0, /* first_level */
validate_last_level,
width,
height,
depth,
1 /* num_samples */,
MIPTREE_CREATE_BUSY);
if (!brw_obj->mt)
return;
}
/* Pull in any images not in the object's tree:
*/
nr_faces = _mesa_num_tex_faces(intelObj->base.Target);
nr_faces = _mesa_num_tex_faces(brw_obj->base.Target);
for (face = 0; face < nr_faces; face++) {
for (i = validate_first_level; i <= validate_last_level; i++) {
struct brw_texture_image *intelImage =
brw_texture_image(intelObj->base.Image[face][i]);
struct brw_texture_image *brw_image =
brw_texture_image(brw_obj->base.Image[face][i]);
/* skip too small size mipmap */
if (intelImage == NULL)
if (brw_image == NULL)
break;
if (intelObj->mt != intelImage->mt)
brw_miptree_copy_teximage(brw, intelImage, intelObj->mt);
if (brw_obj->mt != brw_image->mt)
brw_miptree_copy_teximage(brw, brw_image, brw_obj->mt);
/* After we're done, we'd better agree that our layout is
* appropriate, or we'll end up hitting this function again on the
* next draw
*/
assert(brw_miptree_match_image(intelObj->mt, &intelImage->base.Base));
assert(brw_miptree_match_image(brw_obj->mt, &brw_image->base.Base));
}
}
intelObj->validated_first_level = validate_first_level;
intelObj->validated_last_level = validate_last_level;
intelObj->_Format = firstImage->base.Base.TexFormat,
intelObj->needs_validate = false;
brw_obj->validated_first_level = validate_first_level;
brw_obj->validated_last_level = validate_last_level;
brw_obj->_Format = firstImage->base.Base.TexFormat,
brw_obj->needs_validate = false;
}
/**