From: Axel Davy <axel.davy@ens.fr>
Date: Tue, 26 Jan 2016 17:21:26 +0000 (+0100)
Subject: st/nine: Add format checks to create_zs_or_rt_surface
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=dbcb4f46ad792ed4f0f3cc64449ccd6288a6f386;p=mesa.git

st/nine: Add format checks to create_zs_or_rt_surface

Returns INVALIDCALL when trying to create a surface
of unsupported format.

In practice, apps are supposed to check for format
support before trying to create a render target
of that format. However some bad behaving apps
could just try to create the surface and deduce if
it failed that it wasn't supported.

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 b6e75b4514f..3ebff3a1b1f 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -1126,6 +1126,9 @@ create_zs_or_rt_surface(struct NineDevice9 *This,
                                                templ.nr_samples, templ.bind,
                                                FALSE);
 
+    if (templ.format == PIPE_FORMAT_NONE && Format != D3DFMT_NULL)
+        return D3DERR_INVALIDCALL;
+
     desc.Format = Format;
     desc.Type = D3DRTYPE_SURFACE;
     desc.Usage = 0;