diff options
| author | Axel Davy <axel.davy@ens.fr> | 2016-03-14 21:26:19 +0100 |
|---|---|---|
| committer | Axel Davy <axel.davy@ens.fr> | 2016-10-10 23:43:48 +0200 |
| commit | 39e98d351f84b3052c59dc97b28936e22918f9d3 (patch) | |
| tree | 40442db007efdc522602f4cf66f884ee20d2f081 /src/gallium/state_trackers | |
| parent | 2290eac84ef0c80a6e60cafac8ed0fb8f8a4ca93 (diff) | |
| download | external_mesa3d-39e98d351f84b3052c59dc97b28936e22918f9d3.zip external_mesa3d-39e98d351f84b3052c59dc97b28936e22918f9d3.tar.gz external_mesa3d-39e98d351f84b3052c59dc97b28936e22918f9d3.tar.bz2 | |
st/nine: Unify some check flags
The new defines will be reused in a later patch.
Signed-off-by: Axel Davy <axel.davy@ens.fr>
Diffstat (limited to 'src/gallium/state_trackers')
| -rw-r--r-- | src/gallium/state_trackers/nine/nine_defines.h | 8 | ||||
| -rw-r--r-- | src/gallium/state_trackers/nine/swapchain9.c | 8 |
2 files changed, 12 insertions, 4 deletions
diff --git a/src/gallium/state_trackers/nine/nine_defines.h b/src/gallium/state_trackers/nine/nine_defines.h index 4f61982..26aa064 100644 --- a/src/gallium/state_trackers/nine/nine_defines.h +++ b/src/gallium/state_trackers/nine/nine_defines.h @@ -54,4 +54,12 @@ uint16_t nine_d3d9_to_nine_declusage(unsigned usage, unsigned index); #define NINED3DCLEAR_DEPTHSTENCIL (D3DCLEAR_ZBUFFER | D3DCLEAR_STENCIL) +#define NINE_BIND_BACKBUFFER_FLAGS (PIPE_BIND_RENDER_TARGET |\ + PIPE_BIND_SAMPLER_VIEW) + +#define NINE_BIND_PRESENTBUFFER_FLAGS (PIPE_BIND_RENDER_TARGET |\ + PIPE_BIND_DISPLAY_TARGET |\ + PIPE_BIND_SCANOUT |\ + PIPE_BIND_SHARED) + #endif /* _NINE_DEFINES_H_ */ diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c index 838c248..87beabc 100644 --- a/src/gallium/state_trackers/nine/swapchain9.c +++ b/src/gallium/state_trackers/nine/swapchain9.c @@ -305,7 +305,7 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, tmplt.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET; tmplt.nr_samples = pParams->MultiSampleType; if (!has_present_buffers) - tmplt.bind |= PIPE_BIND_SHARED | PIPE_BIND_SCANOUT | PIPE_BIND_DISPLAY_TARGET; + tmplt.bind |= NINE_BIND_PRESENTBUFFER_FLAGS; tmplt.format = d3d9_to_pipe_format_checked(This->screen, pParams->BackBufferFormat, PIPE_TEXTURE_2D, @@ -339,7 +339,7 @@ NineSwapChain9_Resize( struct NineSwapChain9 *This, } if (has_present_buffers) { tmplt.format = PIPE_FORMAT_B8G8R8X8_UNORM; - tmplt.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_SHARED | PIPE_BIND_SCANOUT | PIPE_BIND_DISPLAY_TARGET; + tmplt.bind = NINE_BIND_PRESENTBUFFER_FLAGS; tmplt.nr_samples = 0; if (This->actx->linear_framebuffer) tmplt.bind |= PIPE_BIND_LINEAR; @@ -548,8 +548,8 @@ create_present_buffer( struct NineSwapChain9 *This, tmplt.usage = PIPE_USAGE_DEFAULT; tmplt.flags = 0; tmplt.format = PIPE_FORMAT_B8G8R8X8_UNORM; - tmplt.bind = PIPE_BIND_SAMPLER_VIEW | PIPE_BIND_RENDER_TARGET | - PIPE_BIND_SHARED | PIPE_BIND_SCANOUT | PIPE_BIND_DISPLAY_TARGET; + tmplt.bind = NINE_BIND_BACKBUFFER_FLAGS | + NINE_BIND_PRESENTBUFFER_FLAGS; tmplt.nr_samples = 0; if (This->actx->linear_framebuffer) tmplt.bind |= PIPE_BIND_LINEAR; |