Attachment 115565 Details for Bug 90147 – swrast: Build fix for darwin

[patch] swrast: Build fix for darwin

0001-swrast-Build-fix-for-darwin.patch (text/plain), 2.23 KB, created by Julien Isorce on 2015-05-05 21:50:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julien Isorce

Created: 2015-05-05 21:50:30 UTC

Size: 2.23 KB

patch

obsolete

>From c2c4b61985b5573275804a3031511002a0c5af9c Mon Sep 17 00:00:00 2001
>From: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
>Date: Thu, 1 Jan 2015 19:48:40 -0800
>Subject: [PATCH 1/4] swrast: Build fix for darwin
>
>Fixes regression from commit 64b1dc44495890cbc2c7c5509cb830264020998c
>
>Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com>
>CC: Emil Velikov <emil.l.velikov@gmail.com>
>CC: jon.turney@dronecode.org.uk
>CC: ionic@macports.org
>(cherry picked from commit 8da9f46f18fd4c73f2a9d708c86e7e3d5535b3d8)
>---
> src/mesa/drivers/dri/swrast/swrast.c | 16 ++++++++++++++++
> 1 file changed, 16 insertions(+)
>
>diff --git a/src/mesa/drivers/dri/swrast/swrast.c b/src/mesa/drivers/dri/swrast/swrast.c
>index d1bb721..2ddb474 100644
>--- a/src/mesa/drivers/dri/swrast/swrast.c
>+++ b/src/mesa/drivers/dri/swrast/swrast.c
>@@ -61,6 +61,9 @@
> #include "swrast_priv.h"
> #include "swrast/s_context.h"
> 
>+#include <sys/types.h>
>+#include <sys/sysctl.h>
>+
> const __DRIextension **__driDriverGetExtensions_swrast(void);
> 
> const char * const swrast_vendor_string = "Mesa Project";
>@@ -137,6 +140,16 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param,
>       value[0] = 0;
>       return 0;
>    case __DRI2_RENDERER_VIDEO_MEMORY: {
>+      /* This should probably share code with os_get_total_physical_memory()
>+       * from src/gallium/auxiliary/os/os_misc.c
>+       */
>+#if defined(CTL_HW) && defined(HW_MEMSIZE)
>+        int mib[2] = { CTL_HW, HW_MEMSIZE };
>+        unsigned long system_memory_bytes;
>+        size_t len = sizeof(system_memory_bytes);
>+        if (sysctl(mib, 2, &system_memory_bytes, &len, NULL, 0) != 0)
>+            return -1;
>+#elif defined(_SC_PHYS_PAGES) && defined(_SC_PAGE_SIZE)
>       /* XXX: Do we want to return the full amount of system memory ? */
>       const long system_memory_pages = sysconf(_SC_PHYS_PAGES);
>       const long system_page_size = sysconf(_SC_PAGE_SIZE);
>@@ -146,6 +159,9 @@ swrast_query_renderer_integer(__DRIscreen *psp, int param,
> 
>       const uint64_t system_memory_bytes = (uint64_t) system_memory_pages
>          * (uint64_t) system_page_size;
>+#else
>+#error "Unsupported platform"
>+#endif
> 
>       const unsigned system_memory_megabytes =
>          (unsigned) (system_memory_bytes / (1024 * 1024));
>-- 
>1.9.5 (Apple Git-50.3)
>

Actions: View | Splinter Review

Attachments on bug 90147: 115281 | 115565 | 115698

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.