Module: Mesa
Branch: gallium-resources
Commit: 76711ff40d2092f9ef03d452de7458c4e76d9246
URL:
http://cgit.freedesktop.org/mesa/mesa/commit/?id=76711ff40d2092f9ef03d452de7458c4e76d9246
Author: Roland Scheidegger <srol...@vmware.com>
Date: Thu Apr 1 00:04:47 2010 +0200
nvfx: more compile fixes
---
src/gallium/drivers/nvfx/nv30_fragtex.c | 4 ++--
src/gallium/drivers/nvfx/nv40_fragtex.c | 4 ++--
src/gallium/drivers/nvfx/nvfx_miptree.c | 2 +-
src/gallium/drivers/nvfx/nvfx_screen.c | 2 +-
src/gallium/drivers/nvfx/nvfx_transfer.c | 3 ++-
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/gallium/drivers/nvfx/nv30_fragtex.c
b/src/gallium/drivers/nvfx/nv30_fragtex.c
index be76670..e035678 100644
--- a/src/gallium/drivers/nvfx/nv30_fragtex.c
+++ b/src/gallium/drivers/nvfx/nv30_fragtex.c
@@ -93,8 +93,8 @@ nv30_fragtex_build(struct nvfx_context *nvfx, int unit)
{
struct nvfx_sampler_state *ps = nvfx->tex_sampler[unit];
struct nvfx_miptree *nv30mt = (struct nvfx_miptree
*)nvfx->fragment_sampler_views[unit]->texture;
- struct pipe_resource *pt = &nv30mt->base;
- struct nouveau_bo *bo = nouveau_bo(nv30mt->buffer);
+ struct pipe_resource *pt = &nv30mt->base.base;
+ struct nouveau_bo *bo = nv30mt->base.bo;
struct nv30_texture_format *tf;
struct nouveau_stateobj *so;
uint32_t txf, txs;
diff --git a/src/gallium/drivers/nvfx/nv40_fragtex.c
b/src/gallium/drivers/nvfx/nv40_fragtex.c
index 5d521e6..bffdf08 100644
--- a/src/gallium/drivers/nvfx/nv40_fragtex.c
+++ b/src/gallium/drivers/nvfx/nv40_fragtex.c
@@ -111,8 +111,8 @@ nv40_fragtex_build(struct nvfx_context *nvfx, int unit)
{
struct nvfx_sampler_state *ps = nvfx->tex_sampler[unit];
struct nvfx_miptree *nv40mt = (struct nvfx_miptree
*)nvfx->fragment_sampler_views[unit]->texture;
- struct nouveau_bo *bo = nouveau_bo(nv40mt->buffer);
- struct pipe_resource *pt = &nv40mt->base;
+ struct nouveau_bo *bo = nv40mt->base.bo;
+ struct pipe_resource *pt = &nv40mt->base.base;
struct nv40_texture_format *tf;
struct nouveau_stateobj *so;
uint32_t txf, txs, txp;
diff --git a/src/gallium/drivers/nvfx/nvfx_miptree.c
b/src/gallium/drivers/nvfx/nvfx_miptree.c
index de6fc82..432fb29 100644
--- a/src/gallium/drivers/nvfx/nvfx_miptree.c
+++ b/src/gallium/drivers/nvfx/nvfx_miptree.c
@@ -171,7 +171,7 @@ nvfx_miptree_create(struct pipe_screen *pscreen, const
struct pipe_resource *pt)
case PIPE_FORMAT_R16_SNORM:
{
if (no_swizzle)
- mt->base.flags |= NVFX_RESOURCE_FLAG_LINEAR;
+ mt->base.base.flags |=
NVFX_RESOURCE_FLAG_LINEAR;
break;
}
default:
diff --git a/src/gallium/drivers/nvfx/nvfx_screen.c
b/src/gallium/drivers/nvfx/nvfx_screen.c
index aca60be..1f6e6e3 100644
--- a/src/gallium/drivers/nvfx/nvfx_screen.c
+++ b/src/gallium/drivers/nvfx/nvfx_screen.c
@@ -376,7 +376,7 @@ nvfx_screen_create(struct pipe_winsys *ws, struct
nouveau_device *dev)
}
nvfx_screen_init_resource_functions(pscreen);
- nvfx_screen_init_miptree_functions(pscreen);
+ nvfx_screen_init_buffer_functions(screen);
ret = nouveau_grobj_alloc(chan, 0xbeef3097, eng3d_class,
&screen->eng3d);
if (ret) {
diff --git a/src/gallium/drivers/nvfx/nvfx_transfer.c
b/src/gallium/drivers/nvfx/nvfx_transfer.c
index 3d371c7..59ab148 100644
--- a/src/gallium/drivers/nvfx/nvfx_transfer.c
+++ b/src/gallium/drivers/nvfx/nvfx_transfer.c
@@ -50,7 +50,7 @@ static unsigned nvfx_transfer_bind_flags( unsigned
transfer_usage )
}
struct pipe_transfer *
-nvfx_miptree_transfer_new(struct pipe_context *pcontext,
+nvfx_miptree_transfer_new(struct pipe_context *pipe,
struct pipe_resource *pt,
struct pipe_subresource sr,
unsigned usage,
@@ -183,6 +183,7 @@ nvfx_miptree_transfer_map(struct pipe_context *pipe, struct
pipe_transfer *ptx)
struct nvfx_transfer *tx = (struct nvfx_transfer *)ptx;
struct nv04_surface *ns = (struct nv04_surface *)tx->surface;
struct nvfx_miptree *mt = (struct nvfx_miptree *)tx->surface->texture;
+ uint8_t *map = nouveau_screen_bo_map(pscreen, mt->base.bo,
nouveau_screen_transfer_flags(ptx->usage));
if(!tx->direct)
_______________________________________________
mesa-commit mailing list
mesa-commit@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/mesa-commit
