From: Axel Davy <axel.davy@ens.fr>
Date: Tue, 26 Jan 2016 15:40:30 +0000 (+0100)
Subject: st/nine: Disallow non-argb8888 cursors
X-Git-Tag: android-x86-6.0-r1~4060
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b12fe77ea7bbd8f159c0902a7c1d4ab22d4629c;p=android-x86%2Fexternal-mesa.git

st/nine: Disallow non-argb8888 cursors

Only argb8888 cursors are allowed.

Signed-off-by: Axel Davy <axel.davy@ens.fr>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
---

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 17a8b60dfd6..475ef96788e 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -629,6 +629,7 @@ NineDevice9_SetCursorProperties( struct NineDevice9 *This,
              "pCursorBitmap=%p\n", This, XHotSpot, YHotSpot, pCursorBitmap);
 
     user_assert(pCursorBitmap, D3DERR_INVALIDCALL);
+    user_assert(surf->desc.Format == D3DFMT_A8R8G8B8, D3DERR_INVALIDCALL);
 
     if (This->swapchains[0]->params.Windowed) {
         This->cursor.w = MIN2(surf->desc.Width, 32);