upstream/oracle/x-cons/x-s12-clone: open-src/lib/mesa/solaris-port.patch@590b35f0ad83 (annotated)

1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	1	--- src/mesa/drivers/dri/intel/intel_context.h Thu Apr 8 12:57:04 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	2	+++ src/mesa/drivers/dri/intel/intel_context.h Thu Apr 8 13:02:36 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	3	@@ -254,9 +254,13 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	4	driOptionCache optionCache;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	5	};
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	6
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	7	+#if defined(__sun)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	8	+#include <stdlib.h>
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	9	+#define __progname getexecname()
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	10	+#else
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	11	extern char *__progname;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	12	+#endif
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	13
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	14	-
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	15	#define SUBPIXEL_X 0.125
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	16	#define SUBPIXEL_Y 0.125
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	17
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	18	@@ -288,7 +292,7 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	19	* than COPY_DWORDS would:
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	20	* XXX Put this in src/mesa/main/imports.h ???
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	21	*/
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	22	-#if defined(i386) \|\| defined(__i386__)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	23	+#if (defined(i386) \|\| defined(__i386__)) && !(defined(__SOLARIS__) \|\| defined(sun))
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	24	static INLINE void * __memcpy(void * to, const void * from, size_t n)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	25	{
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	26	int d0, d1, d2;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	27	--- src/mesa/drivers/dri/intel/intel_batchbuffer.h Thu Apr 8 13:04:23 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	28	+++ src/mesa/drivers/dri/intel/intel_batchbuffer.h Thu Apr 8 13:05:06 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	29	@@ -8,7 +8,8 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	30	#include "intel_reg.h"
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	31
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	32	#define BATCH_SZ 16384
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	33	-#define BATCH_RESERVED 16
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	34	+#define BATCH_RESERVED16 16
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	35	+#define BATCH_RESERVED4k 4096
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	36
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	37
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	38	struct intel_batchbuffer
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	39	@@ -92,7 +93,10 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	40	static INLINE GLint
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	41	intel_batchbuffer_space(struct intel_batchbuffer *batch)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	42	{
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	43	- return (batch->size - batch->reserved_space) - (batch->ptr - batch->map);
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	44	+ if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	45	+ return (batch->size - BATCH_RESERVED16) - (batch->ptr - batch->map);
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	46	+ else
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	47	+ return (batch->size - BATCH_RESERVED4k) - (batch->ptr - batch->map);
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	48	}
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	49
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	50
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	51	--- src/glx/glxcurrent.c Thu Apr 8 13:08:15 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	52	+++ src/glx/glxcurrent.c Thu Apr 8 13:08:49 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	53	@@ -397,7 +397,7 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	54
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	55	#ifdef GLX_DIRECT_RENDERING
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	56	if ((dpy != oldGC->currentDpy \|\| (gc && gc->driContext)) &&
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	57	- !oldGC->isDirect && oldGC != &dummyContext) {
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	58	+ !oldGC->isDirect && oldGC != &dummyContext && oldGC->xid != None) {
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	59	#else
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	60	if ((dpy != oldGC->currentDpy) && oldGC != &dummyContext) {
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	61	#endif
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	62	--- src/glx/Makefile Thu Apr 8 13:17:33 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	63	+++ src/glx/Makefile Thu Apr 8 13:18:05 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	64	@@ -65,6 +65,10 @@
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	65
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	66	default: depend $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME)
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	67
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	68	+# Needed to truly hide symbols gcc treats as HIDDEN/INTERNAL but doesn't mark
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	69	+# as hidden in the ELF files properly.
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	70	+GL_LIB_DEPS += -Wl,-M,mapfile.scope
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	71	+
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	72	# Make libGL
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	73	$(TOP)/$(LIB_DIR)/$(GL_LIB_NAME): $(OBJECTS) $(GLAPI_LIB) Makefile
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	74	$(MKLIB) -o $(GL_LIB) -linker '$(CC)' -ldflags '$(LDFLAGS)' \
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	75	diff -urp -x '~' -x '.orig' src/mesa/drivers/dri/Makefile.template src/mesa/drivers/dri/Makefile.template
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	76	--- src/mesa/drivers/dri/Makefile.template 2009-03-12 20:28:49.000000000 -0700
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	77	+++ src/mesa/drivers/dri/Makefile.template 2009-03-31 09:12:45.628778000 -0700
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	78	@@ -1,5 +1,10 @@
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	79	# --makefile--
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	80
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	81	+# Needed to specify symbols which are allowed to be undefined when
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	82	+# linking DRI modules with -z defs
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	83	+DRI_LIB_DEPS += -Wl,-M,$(TOP)/src/mesa/drivers/dri/mapfile.externs
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	84	+
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	85	+
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	86	MESA_MODULES = $(TOP)/src/mesa/libmesa.a
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	87
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	88	COMMON_SOURCES = \
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	89	--- src/mesa/drivers/dri/common/dri_util.h Thu Apr 8 13:21:04 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	90	+++ src/mesa/drivers/dri/common/dri_util.h Thu Apr 8 13:21:23 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	91	@@ -57,6 +57,10 @@
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	92
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	93	#define GLX_BAD_CONTEXT 5
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	94
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	95	+#define u_int64_t uint64_t
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	96	+#define u_int32_t uint32_t
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	97	+#define u_int8_t uint8_t
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	98	+
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	99	typedef struct __DRIswapInfoRec __DRIswapInfo;
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	100
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	101	/**
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	102	diff -urp -x '~' -x '.orig' src/mesa/drivers/dri/common/mmio.h src/mesa/drivers/dri/common/mmio.h
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	103	--- src/mesa/drivers/dri/common/mmio.h 2009-01-22 09:38:33.000000000 -0800
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	104	+++ src/mesa/drivers/dri/common/mmio.h 2009-03-31 09:12:45.639560000 -0700
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	105	@@ -34,6 +34,7 @@
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	106	#define MMIO_H
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	107
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	108	#include "main/glheader.h"
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	109	+#include "dri_util.h"
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	110
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	111	#if defined( __powerpc__ )
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	112
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	113	--- src/mesa/drivers/dri/i915/intel_tris.c Thu Apr 8 13:22:36 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	114	+++ src/mesa/drivers/dri/i915/intel_tris.c Thu Apr 8 13:23:31 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	115	@@ -325,7 +325,7 @@
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	116	* Emit primitives as inline vertices *
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	117	***********************************************************************/
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	118
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	119	-#ifdef __i386__
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	120	+#if (defined(i386) \|\| defined(__i386__)) && !(defined(__SOLARIS__) \|\| defined(sun))
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	121	#define COPY_DWORDS( j, vb, vertsize, v ) \
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	122	do { \
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	123	int __tmp; \
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	124	--- src/mesa/drivers/dri/i965/brw_draw_upload.c Thu Apr 8 13:27:42 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	125	+++ src/mesa/drivers/dri/i965/brw_draw_upload.c Thu Apr 8 13:29:09 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	126	@@ -159,7 +159,24 @@
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	127	BRW_SURFACEFORMAT_R8G8B8A8_SSCALED
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	128	};
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	129
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	130	+#if defined (sun)
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	131	+/* Solaris does not have ffsll in libc */
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	132	+#define NBITS_INT (CHAR_BIT * sizeof (int))
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	133	+static int ffsll(long long i)
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	134	+{
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	135	+ int i1;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	136	+ int ret;
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	137
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	138	+ i1 = i & UINT_MAX;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	139	+ ret = ffs(i1);
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	140	+ if (ret == 0) {
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	141	+ i1 = (i & 0xffffffff00000000) >> NBITS_INT;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	142	+ ret = ffs(i1) + NBITS_INT;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	143	+ }
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	144	+ return ret;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	145	+}
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	146	+#endif
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	147	+
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	148	/**
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	149	* Given vertex array type/size/format/normalized info, return
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	150	* the appopriate hardware surface type.
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	151	diff -urp -x '~' -x '.orig' src/mesa/drivers/dri/intel/server/i830_dri.h src/mesa/drivers/dri/intel/server/i830_dri.h
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	152	--- src/mesa/drivers/dri/intel/server/i830_dri.h 2008-08-25 07:46:43.000000000 -0700
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	153	+++ src/mesa/drivers/dri/intel/server/i830_dri.h 2009-03-31 09:12:45.654900000 -0700
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	154	@@ -21,16 +21,20 @@ typedef struct _I830DRIRec {
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	155	drm_handle_t unused2; /* backbuffer */
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	156
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	157	drmSize unused3; /* depthbufferSize */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	158	+ drmSize pad0;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	159	drm_handle_t unused4; /* depthbuffer */
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	160
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	161	drmSize unused5; /* rotatedSize */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	162	+ drmSize pad1;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	163	drm_handle_t unused6; /* rotatedbuffer */
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	164
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	165	drm_handle_t unused7; /* textures */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	166	int unused8; /* textureSize */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	167	+ drmSize pad2;
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	168
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	169	drm_handle_t unused9; /* agp_buffers */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	170	drmSize unused10; /* agp_buf_size */
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	171	+ drmSize pad3;
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	172
606 068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	173	int deviceID;
068c11b419c9 6582489 X11R7.4: Xorg server 1.5.3, Mesa 7.2, and associated driver updates Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: diff changeset	174	int width;
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	175
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	176	diff -urp -x '~' -x '.orig' src/mesa/drivers/dri/radeon/server/radeon_dri.h src/mesa/drivers/dri/radeon/server/radeon_dri.h
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	177	--- src/mesa/drivers/dri/radeon/server/radeon_dri.h 2009-01-22 09:38:33.000000000 -0800
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	178	+++ src/mesa/drivers/dri/radeon/server/radeon_dri.h 2009-03-31 09:12:45.642139000 -0700
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	179	@@ -89,6 +89,7 @@ typedef struct {
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	180	/@{/
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	181	drm_handle_t registerHandle; /*< \brief MMIO register map size /
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	182	drmSize registerSize; /*< \brief MMIO register map handle /
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	183	+ int padding0;
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	184	/@}/
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	185
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	186	/**
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	187	@@ -97,6 +98,7 @@ typedef struct {
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	188	/@{/
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	189	drm_handle_t statusHandle; /*< \brief status map handle /
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	190	drmSize statusSize; /*< \brief status map size /
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	191	+ int padding1;
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	192	/@}/
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	193
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	194	/**
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	195	@@ -105,11 +107,13 @@ typedef struct {
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	196	/@{/
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	197	drm_handle_t gartTexHandle; /*< \brief AGP texture area map handle /
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	198	drmSize gartTexMapSize; /*< \brief AGP texture area map size /
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	199	+ int padding2;
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	200	int log2GARTTexGran; /*< \brief AGP texture granularity in log base 2 /
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	201	int gartTexOffset; /*< \brief AGP texture area offset in AGP space /
24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	202	/@}/
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	203
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	204	unsigned int sarea_priv_offset; /*< \brief offset of the private SAREA data/
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	205	+ int padding3;
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	206	} RADEONDRIRec, *RADEONDRIPtr;
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	207
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	208	#endif
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	209	--- src/mesa/drivers/dri/intel/intel_batchbuffer.c Tue Mar 30 15:21:12 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	210	+++ src/mesa/drivers/dri/intel/intel_batchbuffer.c Tue Mar 30 15:22:42 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	211	@@ -244,7 +244,10 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	212	if (intel->vtbl.finish_batch)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	213	intel->vtbl.finish_batch(intel);
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	214
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	215	- batch->reserved_space = BATCH_RESERVED;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	216	+ if (batch->intel->intelScreen->deviceID == PCI_CHIP_I865_G)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	217	+ batch->reserved_space = BATCH_RESERVED16;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	218	+ else
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	219	+ batch->reserved_space = BATCH_RESERVED4k;
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	220
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	221	/* TODO: Just pass the relocation list and dma buffer up to the
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	222	* kernel.
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	223	--- src/gallium/drivers/svga/Makefile Thu Apr 8 14:31:43 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	224	+++ src/gallium/drivers/svga/Makefile Thu Apr 8 14:31:51 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	225	@@ -54,7 +54,7 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	226	CFLAGS := $(filter-out -pedantic, $(filter-out -ansi, $(CFLAGS)))
705 24ca414edbff 6826940 Xorg server 1.6.1, Mesa 7.4.1, and associated module upgrades [PSARC 2009/292] Alan Coopersmith <Alan.Coopersmith@Sun.COM> parents: 606 diff changeset	227
1089 590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	228	LIBRARY_DEFINES = \
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	229	- -std=gnu99 -fvisibility=hidden \
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	230	+ -std=gnu99 \
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	231	-DHAVE_STDINT_H -DHAVE_SYS_TYPES_H
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	232
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	233	include ../../Makefile.template
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	234	--- src/glx/single2.c Tue Apr 20 11:00:09 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	235	+++ src/glx/single2.c Tue Apr 20 11:02:19 2010
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	236	@@ -44,6 +44,9 @@
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	237	#include <X11/Xlib-xcb.h>
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	238	#endif /* USE_XCB */
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	239
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	240	+#if !defined(__GNUC__)
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	241	+# define __builtin_expect(x, y) x
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	242	+#endif
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	243
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	244	/* Used for GL_ARB_transpose_matrix */
590b35f0ad83 7012628 Intel Graphics 2009Q4 updates (xf86-video-intel 2.10 & mesa 7.8.2) Niveditha Rau <Niveditha.Rau@Oracle.COM> parents: 943 diff changeset	245	static void

author	Niveditha Rau <Niveditha.Rau@Oracle.COM>
	Tue, 15 Mar 2011 09:30:26 -0700
changeset 1089	590b35f0ad83
parent 943	294f64612d23
child 1124	7bc7e624f965
permissions	-rw-r--r--