diff options
Diffstat (limited to 'src/gallium/drivers/nvfx/nvfx_resource.h')
-rw-r--r-- | src/gallium/drivers/nvfx/nvfx_resource.h | 30 |
1 files changed, 1 insertions, 29 deletions
diff --git a/src/gallium/drivers/nvfx/nvfx_resource.h b/src/gallium/drivers/nvfx/nvfx_resource.h index 6e0493fea4c..4a663583b46 100644 --- a/src/gallium/drivers/nvfx/nvfx_resource.h +++ b/src/gallium/drivers/nvfx/nvfx_resource.h @@ -47,18 +47,6 @@ nvfx_resource_on_gpu(struct pipe_resource* pr) #define NVFX_MAX_TEXTURE_LEVELS 16 -/* We have the following invariants for render temporaries - * - * 1. Render temporaries are always linear - * 2. Render temporaries are always up to date - * 3. Currently, render temporaries are destroyed when the resource is used for sampling, but kept for any other use - * - * Also, we do NOT flush temporaries on any pipe->flush(). - * This is fine, as long as scanout targets and shared resources never need temps. - * - * TODO: we may want to also support swizzled temporaries to improve performance in some cases. - */ - struct nvfx_miptree { struct nvfx_resource base; @@ -67,15 +55,12 @@ struct nvfx_miptree { unsigned level_offset[NVFX_MAX_TEXTURE_LEVELS]; struct util_surfaces surfaces; - struct util_dirty_surfaces dirty_surfaces; }; struct nvfx_surface { - struct util_dirty_surface base; + struct pipe_surface base; unsigned pitch; unsigned offset; - - struct nvfx_miptree* temp; }; static INLINE struct nouveau_bo * @@ -86,13 +71,6 @@ nvfx_surface_buffer(struct pipe_surface *surf) return mt->bo; } -static INLINE struct util_dirty_surfaces* -nvfx_surface_get_dirty_surfaces(struct pipe_surface* surf) -{ - struct nvfx_miptree *mt = (struct nvfx_miptree *)surf->texture; - return &mt->dirty_surfaces; -} - void nvfx_init_resource_functions(struct pipe_context *pipe); @@ -159,12 +137,6 @@ nvfx_subresource_pitch(struct pipe_resource* pt, unsigned level) } } -void -nvfx_surface_create_temp(struct pipe_context* pipe, struct pipe_surface* surf); - -void -nvfx_surface_flush(struct pipe_context* pipe, struct pipe_surface* surf); - struct nvfx_buffer { struct nvfx_resource base; |