diff options
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/nine/surface9.c | 28 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/surface9.h | 17 |
2 files changed, 32 insertions, 13 deletions
diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c index 4b8e2132abc..836369cafdb 100644 --- a/src/gallium/state_trackers/nine/surface9.c +++ b/src/gallium/state_trackers/nine/surface9.c @@ -755,6 +755,33 @@ NineSurface9_UploadSelf( struct NineSurface9 *This, return D3D_OK; } +/* Currently nine_context uses the NineSurface9 + * fields when it is render target. Any modification requires + * pending commands with the surface to be executed. If the bind + * count is 0, there is no pending commands. */ +#define PROCESS_IF_BOUND(surf) \ + if (surf->base.base.bind) \ + nine_csmt_process(surf->base.base.device); + +void +NineSurface9_SetResource( struct NineSurface9 *This, + struct pipe_resource *resource, unsigned level ) +{ + /* No need to call PROCESS_IF_BOUND, because SetResource is used only + * for MANAGED textures, and they are not render targets. */ + assert(This->base.pool == D3DPOOL_MANAGED); + This->level = level; + pipe_resource_reference(&This->base.resource, resource); +} + +void +NineSurface9_SetMultiSampleType( struct NineSurface9 *This, + D3DMULTISAMPLE_TYPE mst ) +{ + PROCESS_IF_BOUND(This); + This->desc.MultiSampleType = mst; +} + void NineSurface9_SetResourceResize( struct NineSurface9 *This, struct pipe_resource *resource ) @@ -764,6 +791,7 @@ NineSurface9_SetResourceResize( struct NineSurface9 *This, assert(This->desc.Pool == D3DPOOL_DEFAULT); assert(!This->texture); + PROCESS_IF_BOUND(This); pipe_resource_reference(&This->base.resource, resource); This->desc.Width = This->base.info.width0 = resource->width0; diff --git a/src/gallium/state_trackers/nine/surface9.h b/src/gallium/state_trackers/nine/surface9.h index 6f416f2de6a..7badde4e172 100644 --- a/src/gallium/state_trackers/nine/surface9.h +++ b/src/gallium/state_trackers/nine/surface9.h @@ -103,22 +103,13 @@ NineSurface9_GetResource( struct NineSurface9 *This ) return This->base.resource; } -static inline void +void NineSurface9_SetResource( struct NineSurface9 *This, - struct pipe_resource *resource, unsigned level ) -{ - This->level = level; - pipe_resource_reference(&This->base.resource, resource); - pipe_surface_reference(&This->surface[0], NULL); - pipe_surface_reference(&This->surface[1], NULL); -} + struct pipe_resource *resource, unsigned level ); -static inline void +void NineSurface9_SetMultiSampleType( struct NineSurface9 *This, - D3DMULTISAMPLE_TYPE mst ) -{ - This->desc.MultiSampleType = mst; -} + D3DMULTISAMPLE_TYPE mst ); void NineSurface9_SetResourceResize( struct NineSurface9 *This, |