summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Bouchoux <[email protected]>2015-02-16 10:02:42 +0100
committerAxel Davy <[email protected]>2015-04-29 08:28:10 +0200
commitf3fd06e94d29172a5de68594d3a6433f91a41362 (patch)
treeaee3cc6cc95b8ff32a38cc7b19d2840845681296
parent77a38d2088678fa756aca61592777f12e245ac0c (diff)
st/nine: Clear struct pipe_blit_info before use.
render_condition_enable was uninitialized. Reviewed-by: Ilia Mirkin <[email protected]> Reviewed-by: Axel Davy <[email protected]> Signed-off-by: Xavier Bouchoux <[email protected]>
-rw-r--r--src/gallium/state_trackers/nine/device9.c2
-rw-r--r--src/gallium/state_trackers/nine/swapchain9.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 1430ca57c7c..43eb7e6397c 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -1342,6 +1342,7 @@ NineDevice9_StretchRect( struct NineDevice9 *This,
(pSourceRect->left <= pSourceRect->right &&
pSourceRect->top <= pSourceRect->bottom), D3DERR_INVALIDCALL);
+ memset(&blit, 0, sizeof(blit));
blit.dst.resource = dst_res;
blit.dst.level = dst->level;
blit.dst.box.z = dst->layer;
@@ -2130,6 +2131,7 @@ NineDevice9_ResolveZ( struct NineDevice9 *This )
desc = util_format_description(dst->format);
user_assert(desc->colorspace == UTIL_FORMAT_COLORSPACE_ZS, D3DERR_INVALIDCALL);
+ memset(&blit, 0, sizeof(blit));
blit.src.resource = src;
blit.src.level = 0;
blit.src.format = src->format;
diff --git a/src/gallium/state_trackers/nine/swapchain9.c b/src/gallium/state_trackers/nine/swapchain9.c
index 2a851546000..c40bc602460 100644
--- a/src/gallium/state_trackers/nine/swapchain9.c
+++ b/src/gallium/state_trackers/nine/swapchain9.c
@@ -554,6 +554,7 @@ handle_draw_cursor_and_hud( struct NineSwapChain9 *This, struct pipe_resource *r
struct pipe_blit_info blit;
if (device->cursor.software && device->cursor.visible && device->cursor.w) {
+ memset(&blit, 0, sizeof(blit));
blit.src.resource = device->cursor.image;
blit.src.level = 0;
blit.src.format = device->cursor.image->format;
@@ -677,6 +678,7 @@ present( struct NineSwapChain9 *This,
handle_draw_cursor_and_hud(This, resource);
if (This->present_buffers) {
+ memset(&blit, 0, sizeof(blit));
blit.src.resource = resource;
blit.src.level = 0;
blit.src.format = resource->format;