Commit 76711ff4 authored by Roland Scheidegger's avatar Roland Scheidegger

nvfx: more compile fixes

parent c5d2e90c
......@@ -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;
......
......@@ -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;
......
......@@ -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:
......
......@@ -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) {
......
......@@ -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)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment