i965: Rename intel_texture_{object,image} to brw_texture_{object,image}

Acked-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9207>

16 files changed, 86 insertions, 86 deletions

diff --git a/src/mesa/drivers/dri/i965/brw_blorp.c b/src/mesa/drivers/dri/i965/brw_blorp.c
index c65a534116e..82d5adbc8d5 100644
--- a/src/mesa/drivers/dri/i965/brw_blorp.c
+++ b/src/mesa/drivers/dri/i965/brw_blorp.c
@@ -698,7 +698,7 @@ brw_blorp_copytexsubimage(struct brw_context *brw,
 {
    struct gl_context *ctx = &brw->ctx;
    struct intel_renderbuffer *src_irb = intel_renderbuffer(src_rb);
-   struct intel_texture_image *intel_image = intel_texture_image(dst_image);
+   struct brw_texture_image *intel_image = brw_texture_image(dst_image);
 
    /* No pixel transfer operations (zoom, bias, mapping), just a blit */
    if (brw->ctx._ImageTransferState)
diff --git a/src/mesa/drivers/dri/i965/brw_draw.c b/src/mesa/drivers/dri/i965/brw_draw.c
index f77a1dd3f1b..571496230d9 100644
--- a/src/mesa/drivers/dri/i965/brw_draw.c
+++ b/src/mesa/drivers/dri/i965/brw_draw.c
@@ -496,7 +496,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
                            bool *draw_aux_buffer_disabled)
 {
    struct gl_context *ctx = &brw->ctx;
-   struct intel_texture_object *tex_obj;
+   struct brw_texture_object *tex_obj;
 
    BITSET_DECLARE(used_for_txf, MAX_COMBINED_TEXTURE_IMAGE_UNITS);
    memset(used_for_txf, 0, sizeof(used_for_txf));
@@ -523,7 +523,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
       for (int i = 0; i <= maxEnabledUnit; i++) {
          if (!ctx->Texture.Unit[i]._Current)
             continue;
-         tex_obj = intel_texture_object(ctx->Texture.Unit[i]._Current);
+         tex_obj = brw_texture_object(ctx->Texture.Unit[i]._Current);
          if (!tex_obj || !tex_obj->mt)
             continue;
 
@@ -537,7 +537,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
    for (int i = 0; i <= maxEnabledUnit; i++) {
       if (!ctx->Texture.Unit[i]._Current)
 	 continue;
-      tex_obj = intel_texture_object(ctx->Texture.Unit[i]._Current);
+      tex_obj = brw_texture_object(ctx->Texture.Unit[i]._Current);
       if (!tex_obj || !tex_obj->mt)
 	 continue;
 
@@ -605,7 +605,7 @@ brw_predraw_resolve_inputs(struct brw_context *brw, bool rendering,
          for (unsigned j = 0; j < prog->info.num_images; j++) {
             struct gl_image_unit *u =
                &ctx->ImageUnits[prog->sh.ImageUnits[j]];
-            tex_obj = intel_texture_object(u->TexObj);
+            tex_obj = brw_texture_object(u->TexObj);
 
             if (tex_obj && tex_obj->mt) {
                if (rendering) {
diff --git a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c b/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
index f65c07d219e..9e74eed3d18 100644
--- a/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
+++ b/src/mesa/drivers/dri/i965/brw_generate_mipmap.c
@@ -40,7 +40,7 @@ brw_generate_mipmap(struct gl_context *ctx, GLenum target,
 {
    struct brw_context *brw = brw_context(ctx);
    struct gen_device_info *devinfo = &brw->screen->devinfo;
-   struct intel_texture_object *intel_obj = intel_texture_object(tex_obj);
+   struct brw_texture_object *intel_obj = brw_texture_object(tex_obj);
    const unsigned base_level = tex_obj->Attrib.BaseLevel;
    unsigned last_level, first_layer, last_layer;
 
diff --git a/src/mesa/drivers/dri/i965/brw_object_purgeable.c b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
index 7a75cfc3f97..f0531f6c917 100644
--- a/src/mesa/drivers/dri/i965/brw_object_purgeable.c
+++ b/src/mesa/drivers/dri/i965/brw_object_purgeable.c
@@ -66,16 +66,16 @@ intel_buffer_object_purgeable(struct gl_context * ctx,
 }
 
 static GLenum
-intel_texture_object_purgeable(struct gl_context * ctx,
+brw_texture_object_purgeable(struct gl_context * ctx,
                                struct gl_texture_object *obj,
                                GLenum option)
 {
-   struct intel_texture_object *intel;
+   struct brw_texture_object *intel;
 
    (void) ctx;
    (void) option;
 
-   intel = intel_texture_object(obj);
+   intel = brw_texture_object(obj);
    if (intel->mt == NULL || intel->mt->bo == NULL)
       return GL_RELEASED_APPLE;
 
@@ -133,15 +133,15 @@ intel_buffer_object_unpurgeable(struct gl_context * ctx,
 }
 
 static GLenum
-intel_texture_object_unpurgeable(struct gl_context * ctx,
+brw_texture_object_unpurgeable(struct gl_context * ctx,
                                  struct gl_texture_object *obj,
                                  GLenum option)
 {
-   struct intel_texture_object *intel;
+   struct brw_texture_object *intel;
 
    (void) ctx;
 
-   intel = intel_texture_object(obj);
+   intel = brw_texture_object(obj);
    if (intel->mt == NULL || intel->mt->bo == NULL)
       return GL_UNDEFINED_APPLE;
 
@@ -178,10 +178,10 @@ void
 brw_init_object_purgeable_functions(struct dd_function_table *functions)
 {
    functions->BufferObjectPurgeable = intel_buffer_object_purgeable;
-   functions->TextureObjectPurgeable = intel_texture_object_purgeable;
+   functions->TextureObjectPurgeable = brw_texture_object_purgeable;
    functions->RenderObjectPurgeable = intel_render_object_purgeable;
 
    functions->BufferObjectUnpurgeable = intel_buffer_object_unpurgeable;
-   functions->TextureObjectUnpurgeable = intel_texture_object_unpurgeable;
+   functions->TextureObjectUnpurgeable = brw_texture_object_unpurgeable;
    functions->RenderObjectUnpurgeable = intel_render_object_unpurgeable;
 }
diff --git a/src/mesa/drivers/dri/i965/brw_wm.c b/src/mesa/drivers/dri/i965/brw_wm.c
index 6f6613cd807..28b3cfa20f7 100644
--- a/src/mesa/drivers/dri/i965/brw_wm.c
+++ b/src/mesa/drivers/dri/i965/brw_wm.c
@@ -277,8 +277,8 @@ brw_populate_sampler_prog_key_data(struct gl_context *ctx,
           * then we need to emit slightly different code to first sample the
           * MCS surface.
           */
-         struct intel_texture_object *intel_tex =
-            intel_texture_object((struct gl_texture_object *)t);
+         struct brw_texture_object *intel_tex =
+            brw_texture_object((struct gl_texture_object *)t);
 
          /* From gen9 onwards some single sampled buffers can also be
           * compressed. These don't need ld2dms sampling along with mcs fetch.
diff --git a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
index 51613dc75e5..bcc1431a595 100644
--- a/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
+++ b/src/mesa/drivers/dri/i965/brw_wm_surface_state.c
@@ -476,7 +476,7 @@ static void brw_update_texture_surface(struct gl_context *ctx,
       brw_update_buffer_texture_surface(ctx, unit, surf_offset);
 
    } else {
-      struct intel_texture_object *intel_obj = intel_texture_object(obj);
+      struct brw_texture_object *intel_obj = brw_texture_object(obj);
       struct intel_mipmap_tree *mt = intel_obj->mt;
 
       if (plane > 0) {
@@ -1147,7 +1147,7 @@ const struct brw_tracked_state brw_renderbuffer_read_surfaces = {
 };
 
 static bool
-is_depth_texture(struct intel_texture_object *iobj)
+is_depth_texture(struct brw_texture_object *iobj)
 {
    GLenum base_format = _mesa_get_format_base_format(iobj->_Format);
    return base_format == GL_DEPTH_COMPONENT ||
@@ -1181,7 +1181,7 @@ update_stage_texture_surfaces(struct brw_context *brw,
          const unsigned unit = prog->SamplerUnits[s];
          const bool used_by_txf = prog->info.textures_used_by_txf & (1 << s);
          struct gl_texture_object *obj = ctx->Texture.Unit[unit]._Current;
-         struct intel_texture_object *iobj = intel_texture_object(obj);
+         struct brw_texture_object *iobj = brw_texture_object(obj);
 
          /* _NEW_TEXTURE */
          if (!obj)
@@ -1541,7 +1541,7 @@ update_image_surface(struct brw_context *brw,
          update_buffer_image_param(brw, u, param);
 
       } else {
-         struct intel_texture_object *intel_obj = intel_texture_object(obj);
+         struct brw_texture_object *intel_obj = brw_texture_object(obj);
          struct intel_mipmap_tree *mt = intel_obj->mt;
 
          unsigned base_layer, num_layers;
diff --git a/src/mesa/drivers/dri/i965/intel_copy_image.c b/src/mesa/drivers/dri/i965/intel_copy_image.c
index 5fb8622655a..f1df377ab1f 100644
--- a/src/mesa/drivers/dri/i965/intel_copy_image.c
+++ b/src/mesa/drivers/dri/i965/intel_copy_image.c
@@ -80,7 +80,7 @@ intel_copy_image_sub_data(struct gl_context *ctx,
    unsigned src_level, dst_level;
 
    if (src_image) {
-      src_mt = intel_texture_image(src_image)->mt;
+      src_mt = brw_texture_image(src_image)->mt;
       src_level = src_image->Level + src_image->TexObject->Attrib.MinLevel;
 
       /* Cube maps actually have different images per face */
@@ -96,7 +96,7 @@ intel_copy_image_sub_data(struct gl_context *ctx,
    }
 
    if (dst_image) {
-      dst_mt = intel_texture_image(dst_image)->mt;
+      dst_mt = brw_texture_image(dst_image)->mt;
 
       dst_level = dst_image->Level + dst_image->TexObject->Attrib.MinLevel;
 
diff --git a/src/mesa/drivers/dri/i965/intel_fbo.c b/src/mesa/drivers/dri/i965/intel_fbo.c
index 9ba60efac4d..a05f3a1e83c 100644
--- a/src/mesa/drivers/dri/i965/intel_fbo.c
+++ b/src/mesa/drivers/dri/i965/intel_fbo.c
@@ -533,7 +533,7 @@ intel_renderbuffer_update_wrapper(struct brw_context *brw,
                                   bool layered)
 {
    struct gl_renderbuffer *rb = &irb->Base.Base;
-   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct brw_texture_image *intel_image = brw_texture_image(image);
    struct intel_mipmap_tree *mt = intel_image->mt;
    int level = image->Level;
 
@@ -594,7 +594,7 @@ intel_render_texture(struct gl_context * ctx,
    struct gl_renderbuffer *rb = att->Renderbuffer;
    struct intel_renderbuffer *irb = intel_renderbuffer(rb);
    struct gl_texture_image *image = rb->TexImage;
-   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct brw_texture_image *intel_image = brw_texture_image(image);
    struct intel_mipmap_tree *mt = intel_image->mt;
    int layer;
 
@@ -964,7 +964,7 @@ intel_renderbuffer_move_to_temp(struct brw_context *brw,
                                 bool invalidate)
 {
    struct gl_renderbuffer *rb =&irb->Base.Base;
-   struct intel_texture_image *intel_image = intel_texture_image(rb->TexImage);
+   struct brw_texture_image *intel_image = brw_texture_image(rb->TexImage);
    struct intel_mipmap_tree *new_mt;
    int width, height, depth;
 
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
index 5526fcef3dd..2af9d122f8f 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.c
@@ -1082,7 +1082,7 @@ bool
 intel_miptree_match_image(struct intel_mipmap_tree *mt,
                           struct gl_texture_image *image)
 {
-   struct intel_texture_image *intelImage = intel_texture_image(image);
+   struct brw_texture_image *intelImage = brw_texture_image(image);
    GLuint level = intelImage->base.Base.Level;
    int width, height, depth;
 
@@ -1365,12 +1365,12 @@ intel_miptree_copy_slice(struct brw_context *brw,
  */
 void
 intel_miptree_copy_teximage(struct brw_context *brw,
-			    struct intel_texture_image *intelImage,
+			    struct brw_texture_image *intelImage,
 			    struct intel_mipmap_tree *dst_mt)
 {
    struct intel_mipmap_tree *src_mt = intelImage->mt;
-   struct intel_texture_object *intel_obj =
-      intel_texture_object(intelImage->base.Base.TexObject);
+   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;
    unsigned start_layer, end_layer;
diff --git a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
index fcf8e743855..48482b149b8 100644
--- a/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
+++ b/src/mesa/drivers/dri/i965/intel_mipmap_tree.h
@@ -35,9 +35,9 @@
  *
  * Original OpenGL allowed texture miplevels to be specified in arbitrary
  * order, and a texture may change size over time.  Thus, each
- * intel_texture_image has a reference to a miptree that contains the pixel
+ * brw_texture_image has a reference to a miptree that contains the pixel
  * data sized appropriately for it, which will later be referenced by/copied
- * to the intel_texture_object at draw time (intel_finalize_mipmap_tree()) so
+ * to the brw_texture_object at draw time (intel_finalize_mipmap_tree()) so
  * that there's a single miptree for the complete texture.
  */
 
@@ -60,7 +60,7 @@ extern "C" {
 struct brw_context;
 struct intel_renderbuffer;
 
-struct intel_texture_image;
+struct brw_texture_image;
 
 /**
  * This bit extends the set of GL_MAP_*_BIT enums.
@@ -481,7 +481,7 @@ intel_miptree_copy_slice(struct brw_context *brw,
 
 void
 intel_miptree_copy_teximage(struct brw_context *brw,
-                            struct intel_texture_image *intelImage,
+                            struct brw_texture_image *intelImage,
                             struct intel_mipmap_tree *dst_mt);
 
 /**
diff --git a/src/mesa/drivers/dri/i965/intel_screen.c b/src/mesa/drivers/dri/i965/intel_screen.c
index 0a9a299888b..93342450e87 100644
--- a/src/mesa/drivers/dri/i965/intel_screen.c
+++ b/src/mesa/drivers/dri/i965/intel_screen.c
@@ -594,7 +594,7 @@ intel_create_image_from_texture(__DRIcontext *context, int target,
    __DRIimage *image;
    struct brw_context *brw = context->driverPrivate;
    struct gl_texture_object *obj;
-   struct intel_texture_object *iobj;
+   struct brw_texture_object *iobj;
    GLuint face = 0;
 
    obj = _mesa_lookup_texture(&brw->ctx, texture);
@@ -607,7 +607,7 @@ intel_create_image_from_texture(__DRIcontext *context, int target,
       face = zoffset;
 
    _mesa_test_texobj_completeness(&brw->ctx, obj);
-   iobj = intel_texture_object(obj);
+   iobj = brw_texture_object(obj);
    if (!obj->_BaseComplete || (level > 0 && !obj->_MipmapComplete)) {
       *error = __DRI_IMAGE_ERROR_BAD_PARAMETER;
       return NULL;
diff --git a/src/mesa/drivers/dri/i965/intel_tex.c b/src/mesa/drivers/dri/i965/intel_tex.c
index e08102321e7..32945721416 100644
--- a/src/mesa/drivers/dri/i965/intel_tex.c
+++ b/src/mesa/drivers/dri/i965/intel_tex.c
@@ -19,13 +19,13 @@ intelNewTextureImage(struct gl_context * ctx)
 {
    DBG("%s\n", __func__);
    (void) ctx;
-   return (struct gl_texture_image *) CALLOC_STRUCT(intel_texture_image);
+   return (struct gl_texture_image *) CALLOC_STRUCT(brw_texture_image);
 }
 
 static void
 intelDeleteTextureImage(struct gl_context * ctx, struct gl_texture_image *img)
 {
-   /* nothing special (yet) for intel_texture_image */
+   /* nothing special (yet) for brw_texture_image */
    _mesa_delete_texture_image(ctx, img);
 }
 
@@ -33,7 +33,7 @@ intelDeleteTextureImage(struct gl_context * ctx, struct gl_texture_image *img)
 static struct gl_texture_object *
 intelNewTextureObject(struct gl_context * ctx, GLuint name, GLenum target)
 {
-   struct intel_texture_object *obj = CALLOC_STRUCT(intel_texture_object);
+   struct brw_texture_object *obj = CALLOC_STRUCT(brw_texture_object);
 
    (void) ctx;
 
@@ -53,7 +53,7 @@ static void
 intelDeleteTextureObject(struct gl_context *ctx,
 			 struct gl_texture_object *texObj)
 {
-   struct intel_texture_object *intelObj = intel_texture_object(texObj);
+   struct brw_texture_object *intelObj = brw_texture_object(texObj);
 
    intel_miptree_release(&intelObj->mt);
    _mesa_delete_texture_object(ctx, texObj);
@@ -64,9 +64,9 @@ intel_alloc_texture_image_buffer(struct gl_context *ctx,
 				 struct gl_texture_image *image)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct brw_texture_image *intel_image = brw_texture_image(image);
    struct gl_texture_object *texobj = image->TexObject;
-   struct intel_texture_object *intel_texobj = intel_texture_object(texobj);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texobj);
 
    assert(image->Border == 0);
 
@@ -129,7 +129,7 @@ intel_alloc_texture_storage(struct gl_context *ctx,
                             GLsizei height, GLsizei depth)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_texture_object *intel_texobj = intel_texture_object(texobj);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texobj);
    struct gl_texture_image *first_image = texobj->Image[0][0];
    int num_samples = intel_quantize_num_samples(brw->screen,
                                                 first_image->NumSamples);
@@ -161,7 +161,7 @@ intel_alloc_texture_storage(struct gl_context *ctx,
    for (face = 0; face < numFaces; face++) {
       for (level = 0; level < levels; level++) {
          struct gl_texture_image *image = texobj->Image[face][level];
-         struct intel_texture_image *intel_image = intel_texture_image(image);
+         struct brw_texture_image *intel_image = brw_texture_image(image);
 
          image->NumSamples = num_samples;
 
@@ -187,7 +187,7 @@ static void
 intel_free_texture_image_buffer(struct gl_context * ctx,
 				struct gl_texture_image *texImage)
 {
-   struct intel_texture_image *intelImage = intel_texture_image(texImage);
+   struct brw_texture_image *intelImage = brw_texture_image(texImage);
 
    DBG("%s\n", __func__);
 
@@ -213,7 +213,7 @@ intel_map_texture_image(struct gl_context *ctx,
 			GLint *out_stride)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_texture_image *intel_image = intel_texture_image(tex_image);
+   struct brw_texture_image *intel_image = brw_texture_image(tex_image);
    struct intel_mipmap_tree *mt = intel_image->mt;
    ptrdiff_t stride;
 
@@ -244,7 +244,7 @@ intel_unmap_texture_image(struct gl_context *ctx,
 			  struct gl_texture_image *tex_image, GLuint slice)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_texture_image *intel_image = intel_texture_image(tex_image);
+   struct brw_texture_image *intel_image = brw_texture_image(tex_image);
    struct intel_mipmap_tree *mt = intel_image->mt;
 
    if (tex_image->TexObject->Target == GL_TEXTURE_CUBE_MAP)
@@ -256,13 +256,13 @@ intel_unmap_texture_image(struct gl_context *ctx,
 }
 
 static GLboolean
-intel_texture_view(struct gl_context *ctx,
+brw_texture_view(struct gl_context *ctx,
                    struct gl_texture_object *texObj,
                    struct gl_texture_object *origTexObj)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_texture_object *intel_tex = intel_texture_object(texObj);
-   struct intel_texture_object *intel_orig_tex = intel_texture_object(origTexObj);
+   struct brw_texture_object *intel_tex = brw_texture_object(texObj);
+   struct brw_texture_object *intel_orig_tex = brw_texture_object(origTexObj);
 
    assert(intel_orig_tex->mt);
    intel_miptree_reference(&intel_tex->mt, intel_orig_tex->mt);
@@ -282,7 +282,7 @@ intel_texture_view(struct gl_context *ctx,
    for (face = 0; face < numFaces; face++) {
       for (level = 0; level < numLevels; level++) {
          struct gl_texture_image *image = texObj->Image[face][level];
-         struct intel_texture_image *intel_image = intel_texture_image(image);
+         struct brw_texture_image *intel_image = brw_texture_image(image);
 
          intel_miptree_reference(&intel_image->mt, intel_orig_tex->mt);
       }
@@ -304,7 +304,7 @@ intel_texture_view(struct gl_context *ctx,
 }
 
 static void
-intel_texture_barrier(struct gl_context *ctx)
+brw_texture_barrier(struct gl_context *ctx)
 {
    struct brw_context *brw = brw_context(ctx);
    const struct gen_device_info *devinfo = &brw->screen->devinfo;
@@ -334,6 +334,6 @@ intelInitTextureFuncs(struct dd_function_table *functions)
    functions->AllocTextureStorage = intel_alloc_texture_storage;
    functions->MapTextureImage = intel_map_texture_image;
    functions->UnmapTextureImage = intel_unmap_texture_image;
-   functions->TextureView = intel_texture_view;
-   functions->TextureBarrier = intel_texture_barrier;
+   functions->TextureView = brw_texture_view;
+   functions->TextureBarrier = brw_texture_barrier;
 }
diff --git a/src/mesa/drivers/dri/i965/intel_tex.h b/src/mesa/drivers/dri/i965/intel_tex.h
index 4c48875f820..52a4020311f 100644
--- a/src/mesa/drivers/dri/i965/intel_tex.h
+++ b/src/mesa/drivers/dri/i965/intel_tex.h
@@ -48,8 +48,8 @@ void intelReleaseTexBuffer(__DRIcontext *pDRICtx, GLint target,
 
 struct intel_mipmap_tree *
 intel_miptree_create_for_teximage(struct brw_context *brw,
-				  struct intel_texture_object *intelObj,
-				  struct intel_texture_image *intelImage,
+				  struct brw_texture_object *intelObj,
+				  struct brw_texture_image *intelImage,
                                   enum intel_miptree_create_flags flags);
 
 void intel_finalize_mipmap_tree(struct brw_context *brw,
diff --git a/src/mesa/drivers/dri/i965/intel_tex_image.c b/src/mesa/drivers/dri/i965/intel_tex_image.c
index b23fb10f34d..d3ba9934c03 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_image.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_image.c
@@ -50,8 +50,8 @@ get_base_dim(unsigned old_base_dim, unsigned new_level_dim, unsigned level)
  */
 struct intel_mipmap_tree *
 intel_miptree_create_for_teximage(struct brw_context *brw,
-				  struct intel_texture_object *intelObj,
-				  struct intel_texture_image *intelImage,
+				  struct brw_texture_object *intelObj,
+				  struct brw_texture_image *intelImage,
                                   enum intel_miptree_create_flags flags)
 {
    GLuint lastLevel;
@@ -135,7 +135,7 @@ intel_texsubimage_blorp(struct brw_context *brw, GLuint dims,
                         GLenum format, GLenum type, const void *pixels,
                         const struct gl_pixelstore_attrib *packing)
 {
-   struct intel_texture_image *intel_image = intel_texture_image(tex_image);
+   struct brw_texture_image *intel_image = brw_texture_image(tex_image);
    const unsigned mt_level = tex_image->Level + tex_image->TexObject->Attrib.MinLevel;
    const unsigned mt_z = tex_image->TexObject->Attrib.MinLayer + tex_image->Face + z;
 
@@ -185,7 +185,7 @@ intel_texsubimage_tiled_memcpy(struct gl_context * ctx,
 {
    struct brw_context *brw = brw_context(ctx);
    const struct gen_device_info *devinfo = &brw->screen->devinfo;
-   struct intel_texture_image *image = intel_texture_image(texImage);
+   struct brw_texture_image *image = brw_texture_image(texImage);
    int src_pitch;
 
    /* The miptree's buffer. */
@@ -318,7 +318,7 @@ intel_upload_tex(struct gl_context * ctx,
                  const struct gl_pixelstore_attrib *packing)
 {
    struct brw_context *brw = brw_context(ctx);
-   struct intel_mipmap_tree *mt = intel_texture_image(texImage)->mt;
+   struct intel_mipmap_tree *mt = brw_texture_image(texImage)->mt;
    bool ok;
 
    /* Check that there is actually data to store. */
@@ -371,7 +371,7 @@ intelTexImage(struct gl_context * ctx,
       return;
    }
 
-   assert(intel_texture_image(texImage)->mt);
+   assert(brw_texture_image(texImage)->mt);
 
    intel_upload_tex(ctx, dims, texImage, 0, 0, 0,
                     texImage->Width, texImage->Height, texImage->Depth,
@@ -409,8 +409,8 @@ intel_set_texture_image_mt(struct brw_context *brw,
 
 {
    struct gl_texture_object *texobj = image->TexObject;
-   struct intel_texture_object *intel_texobj = intel_texture_object(texobj);
-   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texobj);
+   struct brw_texture_image *intel_image = brw_texture_image(image);
 
    _mesa_init_teximage_fields(&brw->ctx, image,
                               mt->surf.logical_level0_px.width,
@@ -504,7 +504,7 @@ intelReleaseTexBuffer(__DRIcontext *pDRICtx, GLint target,
    struct brw_context *brw = pDRICtx->driverPrivate;
    struct gl_context *ctx = &brw->ctx;
    struct gl_texture_object *tex_obj;
-   struct intel_texture_object *intel_tex;
+   struct brw_texture_object *intel_tex;
 
    tex_obj = _mesa_get_current_tex_object(ctx, target);
    if (!tex_obj)
@@ -512,7 +512,7 @@ intelReleaseTexBuffer(__DRIcontext *pDRICtx, GLint target,
 
    _mesa_lock_texture(&brw->ctx, tex_obj);
 
-   intel_tex = intel_texture_object(tex_obj);
+   intel_tex = brw_texture_object(tex_obj);
    if (!intel_tex->mt) {
       _mesa_unlock_texture(&brw->ctx, tex_obj);
       return;
@@ -564,9 +564,9 @@ intel_bind_renderbuffer_tex_image(struct gl_context *ctx,
                                   struct gl_texture_image *image)
 {
    struct intel_renderbuffer *irb = intel_renderbuffer(rb);
-   struct intel_texture_image *intel_image = intel_texture_image(image);
+   struct brw_texture_image *intel_image = brw_texture_image(image);
    struct gl_texture_object *texobj = image->TexObject;
-   struct intel_texture_object *intel_texobj = intel_texture_object(texobj);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texobj);
 
    /* We can only handle RB allocated with AllocRenderbufferStorage, or
     * window-system renderbuffers.
@@ -632,7 +632,7 @@ intel_image_target_texture(struct gl_context *ctx, GLenum target,
    if (mt == NULL)
       return;
 
-   struct intel_texture_object *intel_texobj = intel_texture_object(texObj);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texObj);
    intel_texobj->planar_format = image->planar_format;
    intel_texobj->yuv_color_space = image->yuv_color_space;
 
@@ -682,7 +682,7 @@ intel_image_target_tex_storage(struct gl_context *ctx, GLenum target,
                               struct gl_texture_image *texImage,
                               GLeglImageOES image_handle)
 {
-   struct intel_texture_object *intel_texobj = intel_texture_object(texObj);
+   struct brw_texture_object *intel_texobj = brw_texture_object(texObj);
    intel_image_target_texture(ctx, target, texObj, texImage, image_handle,
                               true);
 
@@ -701,7 +701,7 @@ intel_gettexsubimage_blorp(struct brw_context *brw,
                            GLenum format, GLenum type, const void *pixels,
                            const struct gl_pixelstore_attrib *packing)
 {
-   struct intel_texture_image *intel_image = intel_texture_image(tex_image);
+   struct brw_texture_image *intel_image = brw_texture_image(tex_image);
    const unsigned mt_level = tex_image->Level + tex_image->TexObject->Attrib.MinLevel;
    const unsigned mt_z = tex_image->TexObject->Attrib.MinLayer + tex_image->Face + z;
 
@@ -734,7 +734,7 @@ intel_gettexsubimage_tiled_memcpy(struct gl_context *ctx,
 {
    struct brw_context *brw = brw_context(ctx);
    const struct gen_device_info *devinfo = &brw->screen->devinfo;
-   struct intel_texture_image *image = intel_texture_image(texImage);
+   struct brw_texture_image *image = brw_texture_image(texImage);
    int dst_pitch;
 
    /* The miptree's buffer. */
diff --git a/src/mesa/drivers/dri/i965/intel_tex_obj.h b/src/mesa/drivers/dri/i965/intel_tex_obj.h
index 7338ec2821c..69f32c71558 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_obj.h
+++ b/src/mesa/drivers/dri/i965/intel_tex_obj.h
@@ -32,7 +32,7 @@
 extern "C" {
 #endif
 
-struct intel_texture_object
+struct brw_texture_object
 {
    struct gl_texture_object base;
 
@@ -68,10 +68,10 @@ struct intel_texture_object
 
 
 /**
- * intel_texture_image is a subclass of swrast_texture_image because we
+ * brw_texture_image is a subclass of swrast_texture_image because we
  * sometimes fall back to using the swrast module for software rendering.
  */
-struct intel_texture_image
+struct brw_texture_image
 {
    struct swrast_texture_image base;
 
@@ -82,16 +82,16 @@ struct intel_texture_image
    struct intel_mipmap_tree *mt;
 };
 
-static inline struct intel_texture_object *
-intel_texture_object(struct gl_texture_object *obj)
+static inline struct brw_texture_object *
+brw_texture_object(struct gl_texture_object *obj)
 {
-   return (struct intel_texture_object *) obj;
+   return (struct brw_texture_object *) obj;
 }
 
-static inline struct intel_texture_image *
-intel_texture_image(struct gl_texture_image *img)
+static inline struct brw_texture_image *
+brw_texture_image(struct gl_texture_image *img)
 {
-   return (struct intel_texture_image *) img;
+   return (struct brw_texture_image *) img;
 }
 
 #ifdef __cplusplus
diff --git a/src/mesa/drivers/dri/i965/intel_tex_validate.c b/src/mesa/drivers/dri/i965/intel_tex_validate.c
index 4af63b74062..256b2d1761d 100644
--- a/src/mesa/drivers/dri/i965/intel_tex_validate.c
+++ b/src/mesa/drivers/dri/i965/intel_tex_validate.c
@@ -45,7 +45,7 @@ static void
 intel_update_max_level(struct gl_texture_object *tObj,
 		       struct gl_sampler_object *sampler)
 {
-   struct intel_texture_object *intelObj = intel_texture_object(tObj);
+   struct brw_texture_object *intelObj = brw_texture_object(tObj);
 
    if (!tObj->_MipmapComplete ||
        (tObj->_RenderToTexture &&
@@ -67,10 +67,10 @@ void
 intel_finalize_mipmap_tree(struct brw_context *brw,
                            struct gl_texture_object *tObj)
 {
-   struct intel_texture_object *intelObj = intel_texture_object(tObj);
+   struct brw_texture_object *intelObj = brw_texture_object(tObj);
    GLuint face, i;
    GLuint nr_faces = 0;
-   struct intel_texture_image *firstImage;
+   struct brw_texture_image *firstImage;
    int width, height, depth;
 
    /* TBOs require no validation -- they always just point to their BO. */
@@ -103,7 +103,7 @@ intel_finalize_mipmap_tree(struct brw_context *brw,
     */
    assert(!tObj->Immutable || brw->screen->devinfo.gen < 6);
 
-   firstImage = intel_texture_image(tObj->Image[0][tObj->Attrib.BaseLevel]);
+   firstImage = brw_texture_image(tObj->Image[0][tObj->Attrib.BaseLevel]);
 
    /* Check tree can hold all active levels.  Check tree matches
     * target, imageFormat, etc.
@@ -169,8 +169,8 @@ intel_finalize_mipmap_tree(struct brw_context *brw,
    nr_faces = _mesa_num_tex_faces(intelObj->base.Target);
    for (face = 0; face < nr_faces; face++) {
       for (i = validate_first_level; i <= validate_last_level; i++) {
-         struct intel_texture_image *intelImage =
-            intel_texture_image(intelObj->base.Image[face][i]);
+         struct brw_texture_image *intelImage =
+            brw_texture_image(intelObj->base.Image[face][i]);
 	 /* skip too small size mipmap */
  	 if (intelImage == NULL)
 		 break;