diff options
| author | David Heidelberg <[email protected]> | 2014-11-25 00:38:07 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2014-12-03 22:59:07 +0000 |
| commit | 42839ea5ba5af9e2aefb0d63ab3a621b994904e4 (patch) | |
| tree | 42d3a7cd28dc1f9a8d3b9ef7104901a8c88d7e1c | |
| parent | 8dc03bd57508b0c658d7d428a04af56a34f64c1f (diff) | |
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" <[email protected]>
Tested-by: Yaroslav Andrusyak <[email protected]>
Reviewed-by: Ilia Mirkin <[email protected]>
Reviewed-by: Axel Davy <[email protected]>
Signed-off-by: David Heidelberg <[email protected]>
(cherry picked from commit a99f31bced1ac5dfea9942bb37301a21c9a73189)
| -rw-r--r-- | src/gallium/state_trackers/nine/device9.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/device9.c b/src/gallium/state_trackers/nine/device9.c index 66d5e667f8e..d48f47d5bd4 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 |