4 files changed, 7 insertions, 7 deletions

diff --git a/src/gallium/drivers/nvfx/nvfx_buffer.c b/src/gallium/drivers/nvfx/nvfx_buffer.c
index 24e0a0c7f65..05b824b8f74 100644
--- a/src/gallium/drivers/nvfx/nvfx_buffer.c
+++ b/src/gallium/drivers/nvfx/nvfx_buffer.c
@@ -103,7 +103,7 @@ nvfx_buffer_create(struct pipe_screen *pscreen,
 
 	buffer->bo = nouveau_screen_bo_new(pscreen,
 					   16,
-					   buffer->base._usage,
+					   buffer->base.usage,
 					   buffer->base.bind,
 					   buffer->base.width0);
 
@@ -134,7 +134,7 @@ nvfx_user_buffer_create(struct pipe_screen *pscreen,
 	buffer->vtbl = &nvfx_buffer_vtbl;
 	buffer->base.screen = pscreen;
 	buffer->base.format = PIPE_FORMAT_R8_UNORM;
-	buffer->base._usage = PIPE_USAGE_IMMUTABLE;
+	buffer->base.usage = PIPE_USAGE_IMMUTABLE;
 	buffer->base.bind = usage;
 	buffer->base.width0 = bytes;
 	buffer->base.height0 = 1;
diff --git a/src/gallium/drivers/nvfx/nvfx_miptree.c b/src/gallium/drivers/nvfx/nvfx_miptree.c
index 97b2e5e8b69..aeb88e9ac96 100644
--- a/src/gallium/drivers/nvfx/nvfx_miptree.c
+++ b/src/gallium/drivers/nvfx/nvfx_miptree.c
@@ -145,7 +145,7 @@ nvfx_miptree_create(struct pipe_screen *pscreen, const struct pipe_resource *pt)
 			PIPE_BIND_DEPTH_STENCIL))
 		mt->base.base.flags |= NVFX_RESOURCE_FLAG_LINEAR;
 	else
-	if (pt->_usage == PIPE_USAGE_DYNAMIC)
+	if (pt->usage == PIPE_USAGE_DYNAMIC)
 		mt->base.base.flags |= NVFX_RESOURCE_FLAG_LINEAR;
 	else {
 		switch (pt->format) {
@@ -185,7 +185,7 @@ nvfx_miptree_create(struct pipe_screen *pscreen, const struct pipe_resource *pt)
 	nvfx_miptree_layout(mt);
 
 	mt->base.bo = nouveau_screen_bo_new(pscreen, 256,
-            pt->_usage, pt->bind, mt->total_size);
+            pt->usage, pt->bind, mt->total_size);
 	if (!mt->base.bo) {
 		FREE(mt);
 		return NULL;
diff --git a/src/gallium/drivers/nvfx/nvfx_state_fb.c b/src/gallium/drivers/nvfx/nvfx_state_fb.c
index 8c215980e23..360e569f77c 100644
--- a/src/gallium/drivers/nvfx/nvfx_state_fb.c
+++ b/src/gallium/drivers/nvfx/nvfx_state_fb.c
@@ -67,7 +67,7 @@ nvfx_state_framebuffer_validate(struct nvfx_context *nvfx)
 		depth_only = 1;
 
 		/* Render to depth buffer only */
-		if (!(fb->zsbuf->texture->_usage & NVFX_RESOURCE_FLAG_LINEAR)) {
+		if (!(fb->zsbuf->texture->usage & NVFX_RESOURCE_FLAG_LINEAR)) {
 			assert(!(fb->width & (fb->width - 1)) && !(fb->height & (fb->height - 1)));
 
 			rt_format = NV34TCL_RT_FORMAT_TYPE_SWIZZLED |
diff --git a/src/gallium/drivers/nvfx/nvfx_transfer.c b/src/gallium/drivers/nvfx/nvfx_transfer.c
index a776ab58311..b2ef27cf579 100644
--- a/src/gallium/drivers/nvfx/nvfx_transfer.c
+++ b/src/gallium/drivers/nvfx/nvfx_transfer.c
@@ -31,7 +31,7 @@ nvfx_compatible_transfer_tex(struct pipe_resource *pt, unsigned width, unsigned
 	template->last_level = 0;
 	template->nr_samples = pt->nr_samples;
 	template->bind = bind;
-	template->_usage = PIPE_USAGE_DYNAMIC;
+	template->usage = PIPE_USAGE_DYNAMIC;
 	template->flags = NVFX_RESOURCE_FLAG_LINEAR;
 }
 
@@ -81,7 +81,7 @@ nvfx_miptree_transfer_new(struct pipe_context *pipe,
 	tx->base.stride = mt->level[sr.level].pitch;
 
 	/* Direct access to texture */
-	if ((pt->_usage == PIPE_USAGE_DYNAMIC ||
+	if ((pt->usage == PIPE_USAGE_DYNAMIC ||
 	     no_transfer) &&
 	    pt->flags & NVFX_RESOURCE_FLAG_LINEAR)
 	{