Mesa (10.4): st/nine: return GetAvailableTextureMem in bytes as expected ( v2)

[Emil Velikov]

Module: Mesa
Branch: 10.4
Commit: 42839ea5ba5af9e2aefb0d63ab3a621b994904e4
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=42839ea5ba5af9e2aefb0d63ab3a621b994904e4

Author: David Heidelberg <david at ixit.cz>
Date:   Tue Nov 25 00:38:07 2014 +0100

st/nine: return GetAvailableTextureMem in bytes as expected (v2)

PIPE_CAP_VIDEO_MEMORY returns the amount of video memory in megabytes,
so need to converted it to bytes.

Fixed Warframe memory detection.

v2: also prepare for cards with more than 4GB memory

Cc: "10.4" <mesa-stable at lists.freedesktop.org>
Tested-by: Yaroslav Andrusyak <pontostroy at gmail.com>
Reviewed-by: Ilia Mirkin <imirkin at alum.mit.edu>
Reviewed-by: Axel Davy <axel.davy at ens.fr>
Signed-off-by: David Heidelberg <david at ixit.cz>
(cherry picked from commit a99f31bced1ac5dfea9942bb37301a21c9a73189)

---

 src/gallium/state_trackers/nine/device9.c |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c
index 66d5e66..d48f47d 100644
--- a/src/gallium/state_trackers/nine/device9.c
+++ b/src/gallium/state_trackers/nine/device9.c
@@ -423,7 +423,11 @@ NineDevice9_TestCooperativeLevel( struct NineDevice9 *This )
 UINT WINAPI
 NineDevice9_GetAvailableTextureMem( struct NineDevice9 *This )
 {
-    return This->screen->get_param(This->screen, PIPE_CAP_VIDEO_MEMORY);
+   const unsigned mem = This->screen->get_param(This->screen, PIPE_CAP_VIDEO_MEMORY);
+   if (mem < 4096)
+      return mem << 20;
+   else
+      return UINT_MAX;
 }
 
 HRESULT WINAPI