1351N/A--- src/mesa/drivers/dri/intel/intel_context.h Thu Sep 6 08:31:50 2012
1351N/A+++ src/mesa/drivers/dri/intel/intel_context.h Thu Sep 6 08:33:19 2012
1351N/A@@ -358,9 +358,13 @@
1089N/A driOptionCache optionCache;
1089N/A };
1089N/A
1089N/A+#if defined(__sun)
1089N/A+#include <stdlib.h>
1089N/A+#define __progname getexecname()
1089N/A+#else
1089N/A extern char *__progname;
1089N/A+#endif
1089N/A
1089N/A-
1089N/A #define SUBPIXEL_X 0.125
1089N/A #define SUBPIXEL_Y 0.125
1089N/A
1351N/A@@ -418,7 +422,7 @@
1089N/A * than COPY_DWORDS would:
1089N/A * XXX Put this in src/mesa/main/imports.h ???
1089N/A */
1089N/A-#if defined(i386) || defined(__i386__)
1089N/A+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
1089N/A static INLINE void * __memcpy(void * to, const void * from, size_t n)
1089N/A {
1089N/A int d0, d1, d2;
1351N/A--- src/mesa/drivers/dri/common/dri_util.h Thu Sep 6 08:33:58 2012
1351N/A+++ src/mesa/drivers/dri/common/dri_util.h Thu Sep 6 08:37:46 2012
1351N/A@@ -58,6 +58,11 @@
1351N/A #include "main/mtypes.h"
1351N/A #include "xmlconfig.h"
705N/A
705N/A+#define u_int64_t uint64_t
705N/A+#define u_int32_t uint32_t
705N/A+#define u_int8_t uint8_t
705N/A+
1351N/A+
1089N/A /**
1351N/A * Extensions.
1351N/A /
1351N/A--- src/mesa/drivers/dri/common/mmio.h Thu Sep 6 08:38:14 2012
1351N/A+++ src/mesa/drivers/dri/common/mmio.h Thu Sep 6 08:38:27 2012
705N/A@@ -34,6 +34,7 @@
705N/A #define MMIO_H
1124N/A
705N/A #include "main/glheader.h"
705N/A+#include "dri_util.h"
1124N/A
705N/A #if defined( __powerpc__ )
1124N/A
1351N/A--- src/mesa/drivers/dri/i965/brw_draw_upload.c Thu Sep 6 08:39:01 2012
1351N/A+++ src/mesa/drivers/dri/i965/brw_draw_upload.c Thu Sep 6 08:39:32 2012
1351N/A@@ -209,7 +209,27 @@
705N/A BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
705N/A };
705N/A
705N/A+#if defined (sun)
705N/A+/* Solaris does not have ffsll in libc */
705N/A+#define NBITS_INT (CHAR_BIT * sizeof (int))
705N/A+static int ffsll(long long i)
705N/A+{
1089N/A+ int i1;
1089N/A+ int ret;
705N/A
1089N/A+ i1 = i & UINT_MAX;
1089N/A+ ret = ffs(i1);
1089N/A+ if (ret == 0) {
1089N/A+ i1 = (i & 0xffffffff00000000) >> NBITS_INT;
1089N/A+ ret = ffs(i1) + NBITS_INT;
1089N/A+ }
1089N/A+ return ret;
1089N/A+}
606N/A+#endif
606N/A+
1351N/A+
1351N/A+
1351N/A+
1089N/A /**
1089N/A * Given vertex array type/size/format/normalized info, return
1089N/A * the appopriate hardware surface type.
1351N/A--- src/mesa/drivers/dri/i915/intel_tris.c Thu Sep 6 08:39:52 2012
1351N/A+++ src/mesa/drivers/dri/i915/intel_tris.c Thu Sep 6 08:40:10 2012
1351N/A@@ -345,7 +345,7 @@
1265N/A * Emit primitives as inline vertices *
1265N/A ***********************************************************************/
1124N/A
1265N/A-#ifdef __i386__
1265N/A+#if (defined(i386) || defined(__i386__)) && !(defined(__SOLARIS__) || defined(sun))
1265N/A #define COPY_DWORDS( j, vb, vertsize, v ) \
1265N/A do { \
1265N/A int __tmp; \
1351N/A--- configure.ac Thu Sep 6 08:47:48 2012
1351N/A+++ configure.ac Thu Sep 6 08:48:26 2012
1351N/A@@ -172,7 +172,7 @@
1265N/A # Enable -fvisibility=hidden if using a gcc that supports it
1265N/A save_CFLAGS="$CFLAGS"
1265N/A AC_MSG_CHECKING([whether $CC supports -fvisibility=hidden])
1265N/A- VISIBILITY_CFLAGS="-fvisibility=hidden"
1265N/A+ VISIBILITY_CFLAGS=""
1265N/A CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
1265N/A AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
1265N/A [VISIBILITY_CFLAGS=""; AC_MSG_RESULT([no])]);
1351N/A@@ -193,7 +193,7 @@
1265N/A # Enable -fvisibility=hidden if using a gcc that supports it
1265N/A save_CXXFLAGS="$CXXFLAGS"
1265N/A AC_MSG_CHECKING([whether $CXX supports -fvisibility=hidden])
1265N/A- VISIBILITY_CXXFLAGS="-fvisibility=hidden"
1265N/A+ VISIBILITY_CXXFLAGS=""
1265N/A CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
1351N/A AC_LANG_PUSH([C++])
1265N/A AC_LINK_IFELSE([AC_LANG_PROGRAM()], AC_MSG_RESULT([yes]),
1351N/A--- configure Thu Sep 6 08:48:39 2012
1351N/A+++ configure Thu Sep 6 08:49:02 2012
1351N/A@@ -6040,7 +6040,7 @@
1265N/A save_CFLAGS="$CFLAGS"
1265N/A { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC supports -fvisibility=hidden" >&5
1265N/A $as_echo_n "checking whether $CC supports -fvisibility=hidden... " >&6; }
1265N/A- VISIBILITY_CFLAGS="-fvisibility=hidden"
1265N/A+ VISIBILITY_CFLAGS=""
1265N/A CFLAGS="$CFLAGS $VISIBILITY_CFLAGS"
1265N/A cat confdefs.h - <<_ACEOF >conftest.$ac_ext
1265N/A /* end confdefs.h. */
1351N/A@@ -6080,7 +6080,7 @@
1265N/A save_CXXFLAGS="$CXXFLAGS"
1265N/A { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX supports -fvisibility=hidden" >&5
1265N/A $as_echo_n "checking whether $CXX supports -fvisibility=hidden... " >&6; }
1265N/A- VISIBILITY_CXXFLAGS="-fvisibility=hidden"
1265N/A+ VISIBILITY_CXXFLAGS=""
1265N/A CXXFLAGS="$CXXFLAGS $VISIBILITY_CXXFLAGS"
1351N/A ac_ext=cpp
1351N/A ac_cpp='$CXXCPP $CPPFLAGS'
1351N/A--- src/mesa/drivers/dri/intel/intel_context.c Thu Sep 6 08:54:15 2012
1351N/A+++ src/mesa/drivers/dri/intel/intel_context.c Thu Sep 6 08:54:55 2012
1351N/A@@ -638,7 +638,7 @@
1265N/A driParseConfigFiles(&intel->optionCache, &intelScreen->optionCache,
1265N/A sPriv->myNum, (intel->gen >= 4) ? "i965" : "i915");
1265N/A if (intel->gen < 4)
1265N/A- intel->maxBatchSize = 4096;
1265N/A+ intel->maxBatchSize = 2*4096;
1265N/A else
1265N/A intel->maxBatchSize = sizeof(intel->batch.map);
1265N/A
1351N/A--- src/mesa/drivers/dri/intel/intel_batchbuffer.c Thu Sep 6 08:55:15 2012
1351N/A+++ src/mesa/drivers/dri/intel/intel_batchbuffer.c Thu Sep 6 08:55:35 2012
1265N/A@@ -82,7 +82,7 @@
1265N/A intel->batch.bo = drm_intel_bo_alloc(intel->bufmgr, "batchbuffer",
1265N/A intel->maxBatchSize, 4096);
1265N/A
1265N/A- intel->batch.reserved_space = BATCH_RESERVED;
1265N/A+ intel->batch.reserved_space = 4096;
1265N/A intel->batch.state_batch_offset = intel->batch.bo->size;
1265N/A intel->batch.used = 0;
1351N/A intel->batch.needs_sol_reset = false;