AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

st/nine: Flush pending commands if needed for surface9 changes

Browse Source 
nine_context uses NineSurface9 fields, thus we need to flush
pending commands using the surface before changing the fields.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
This commit is contained in:
Axel Davy
2016-12-28 18:32:39 +01:00
parent f895ab8e22
commit 6b87a2a77a
2 changed files with 32 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/state_trackers/nine/surface9.c
+28
View File
@@ -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;
src/gallium/state_trackers/nine/surface9.h
+4 -13
View File
@@ -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,