Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-10-04 Thread Brian Paul
In this vein, I'd like to rename/remove a few Mesa source files at 
some point to clean up a few things.  Then, some new files will be 
added for the shading language, etc.  That'll require Makefile and 
Imakefile changes.

It might make sense for the Xorg tree to use the stable Mesa branch 
(mesa_6_2_branch) if the DRI driver developers are willing to work on 
that branch.

-Brian
Felix Kühling wrote:
This commit brings up a problem with building bleeding-edge Mesa drivers
in the Xorg tree. Since Xorg still has its own version of Mesa we can't
just change the Imakefiles in xc/lib/GL/mesa/drivers/dri/... as that
would break the build for everybody else. I guess the solution is to
always build the latest Mesa drivers in the Mesa tree.
When I get to making the snapshots build from Xorg CVS that's what I'm
going to do. Unless someone beats me to it I'm also going to update the
building instructions on dri.sourceforge.net accordingly.
BTW, r128_vb.h is now an empty file. Couldn't it be removed?
Regards,
  Felix
On Fri,  1 Oct 2004 18:33:47 -0700 (PDT)
Eric Anholt [EMAIL PROTECTED] wrote:

CVSROOT:/cvs/mesa
Module name:Mesa
Repository: Mesa/src/mesa/drivers/dri/r128/
Changes by: [EMAIL PROTECTED]   04/10/01 18:33:46
Log message:
 Convert Rage 128 over to t_vertex.c.  While it's slightly slower (10% in ipers)
 it's not that big of a deal in more normal apps, and axes a good bit of code.
 And I assume that t_vertex will only get faster.  Removes ~43k from compiled
 binary.
 
 Tested with:	quake3, ut, ipers, texcyl, chromium, tuxracer, neverball (kinda)

Modified files:
 Mesa/src/mesa/drivers/dri/r128/:
   Makefile r128_context.c r128_context.h r128_dd.c 
   r128_ioctl.h r128_lock.c r128_screen.c r128_state.c 
   r128_tex.c r128_texmem.c r128_texstate.c r128_tris.c 
   r128_vb.h 
Removed files:
 Mesa/src/mesa/drivers/dri/r128/:
   r128_vb.c 
 
 Revision  ChangesPath
[snip]
| Felix Kühling [EMAIL PROTECTED] http://fxk.de.vu |
| PGP Fingerprint: 6A3C 9566 5B30 DDED 73C3  B152 151C 5CC1 D888 E595 |
---
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel

---
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-10-04 Thread Keith Whitwell
Brian Paul wrote:
In this vein, I'd like to rename/remove a few Mesa source files at some 
point to clean up a few things.  Then, some new files will be added for 
the shading language, etc.  That'll require Makefile and Imakefile changes.

It might make sense for the Xorg tree to use the stable Mesa branch 
(mesa_6_2_branch) if the DRI driver developers are willing to work on 
that branch.
I'm not sure that Xorg tracking Mesa makes much sense in the long term.  I 
think we're getting to a stage where we can just have Xorg pull in stable 
releases and bugfixes from the stable branches, but let Mesa trunk evolve 
without the fear of breaking Xorg on every checkin.

Keith
---
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-10-03 Thread Felix Kühling
This commit brings up a problem with building bleeding-edge Mesa drivers
in the Xorg tree. Since Xorg still has its own version of Mesa we can't
just change the Imakefiles in xc/lib/GL/mesa/drivers/dri/... as that
would break the build for everybody else. I guess the solution is to
always build the latest Mesa drivers in the Mesa tree.

When I get to making the snapshots build from Xorg CVS that's what I'm
going to do. Unless someone beats me to it I'm also going to update the
building instructions on dri.sourceforge.net accordingly.

BTW, r128_vb.h is now an empty file. Couldn't it be removed?

Regards,
  Felix

On Fri,  1 Oct 2004 18:33:47 -0700 (PDT)
Eric Anholt [EMAIL PROTECTED] wrote:

 CVSROOT:  /cvs/mesa
 Module name:  Mesa
 Repository:   Mesa/src/mesa/drivers/dri/r128/
 Changes by:   [EMAIL PROTECTED]   04/10/01 18:33:46
 
 Log message:
   Convert Rage 128 over to t_vertex.c.  While it's slightly slower (10% in ipers)
   it's not that big of a deal in more normal apps, and axes a good bit of code.
   And I assume that t_vertex will only get faster.  Removes ~43k from compiled
   binary.
   
   Tested with:quake3, ut, ipers, texcyl, chromium, tuxracer, neverball 
 (kinda)
 
 Modified files:
   Mesa/src/mesa/drivers/dri/r128/:
 Makefile r128_context.c r128_context.h r128_dd.c 
 r128_ioctl.h r128_lock.c r128_screen.c r128_state.c 
 r128_tex.c r128_texmem.c r128_texstate.c r128_tris.c 
 r128_vb.h 
 Removed files:
   Mesa/src/mesa/drivers/dri/r128/:
 r128_vb.c 
   
   Revision  ChangesPath
[snip]

| Felix Kühling [EMAIL PROTECTED] http://fxk.de.vu |
| PGP Fingerprint: 6A3C 9566 5B30 DDED 73C3  B152 151C 5CC1 D888 E595 |


---
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-10-03 Thread Eric Anholt
On Sun, 2004-10-03 at 04:36, Felix Kühling wrote:
 This commit brings up a problem with building bleeding-edge Mesa drivers
 in the Xorg tree. Since Xorg still has its own version of Mesa we can't
 just change the Imakefiles in xc/lib/GL/mesa/drivers/dri/... as that
 would break the build for everybody else. I guess the solution is to
 always build the latest Mesa drivers in the Mesa tree.
 
 When I get to making the snapshots build from Xorg CVS that's what I'm
 going to do. Unless someone beats me to it I'm also going to update the
 building instructions on dri.sourceforge.net accordingly.

I would really like this.

 BTW, r128_vb.h is now an empty file. Couldn't it be removed?

Yeah, it was left over from applying patch and forgetting to cvs rm. 
Done now.  Thanks!

-- 
Eric Anholt[EMAIL PROTECTED]  
http://people.freebsd.org/~anholt/ [EMAIL PROTECTED]




---
This SF.net email is sponsored by: IT Product Guide on ITManagersJournal
Use IT products in your business? Tell us what you think of them. Give us
Your Opinions, Get Free ThinkGeek Gift Certificates! Click to find out more
http://productguide.itmanagersjournal.com/guidepromo.tmpl
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-06-08 Thread Felix Kühling
On Tue, 08 Jun 2004 02:19:18 -0700
Eric Anholt [EMAIL PROTECTED] wrote:

 CVSROOT:  /cvs/mesa
 Module name:  Mesa
 Repository:   Mesa/src/mesa/drivers/dri/sis/
 Changes by:   [EMAIL PROTECTED]   04/06/08 02:19:18
 
 Log message:
   * Convert to use t_vertex.c instead of sis_vb.[ch]

Looks like the Imakefiles need updating too. The snapshot build just failed with:

make[5]: *** No rule to make target 
`/home/projects/dri/snapshots/src/Mesa/src/mesa/drivers/dri/sis/sis_vb.c', needed by 
`sis_vb.c'.  Stop.
make[5]: Leaving directory 
`/home/projects/dri/snapshots/build/HEAD/xc/lib/GL/mesa/drivers/dri/sis'
...

   * Don't dispatch vertices directly to MMIO; queue them up in dma-like buffers
 first.  This makes things more uniform between AGP and MMIO paths, cleans up
 some locking ugliness, and makes the driver look more like other drivers.
   * Don't use the AGP Cmd buffer provided by the server.  Instead allocate one in
 the client, which avoids the need for lots of synchronization stuff.
   * Mark some MMIO accesses volatile that should have been.
   * Disable the AGP submission path by default (agp_disable=true) due to
 unresolved issues in the new code.  The old code had its own (serious) errors
 with AGP, so this is not really a step backwards.
 
 Modified files:
   Mesa/src/mesa/drivers/dri/sis/:
 Makefile sis_context.c sis_context.h sis_dd.c sis_reg.h 
 sis_screen.c sis_span.c sis_span.h sis_state.c sis_tris.c 
 sis_tris.h sis_tritmp.h 
 Removed files:
   Mesa/src/mesa/drivers/dri/sis/:
 sis_vb.c sis_vb.h 
   
   Revision  ChangesPath
   1.6   +1 -2  Mesa/src/mesa/drivers/dri/sis/Makefile
   1.9   +26 -13Mesa/src/mesa/drivers/dri/sis/sis_context.c
   1.10  +20 -19Mesa/src/mesa/drivers/dri/sis/sis_context.h
   1.5   +9 -4  Mesa/src/mesa/drivers/dri/sis/sis_dd.c
   1.4   +10 -0 Mesa/src/mesa/drivers/dri/sis/sis_reg.h
   1.9   +1 -1  Mesa/src/mesa/drivers/dri/sis/sis_screen.c
   1.5   +9 -2  Mesa/src/mesa/drivers/dri/sis/sis_span.c
   1.3   +3 -0  Mesa/src/mesa/drivers/dri/sis/sis_span.h
   1.5   +7 -56 Mesa/src/mesa/drivers/dri/sis/sis_state.c
   1.7   +462 -339  Mesa/src/mesa/drivers/dri/sis/sis_tris.c
   1.3   +28 -2 Mesa/src/mesa/drivers/dri/sis/sis_tris.h
   1.3   +12 -92Mesa/src/mesa/drivers/dri/sis/sis_tritmp.h
 

| Felix Kühling [EMAIL PROTECTED] http://fxk.de.vu |
| PGP Fingerprint: 6A3C 9566 5B30 DDED 73C3  B152 151C 5CC1 D888 E595 |


---
This SF.Net email is sponsored by: GNOME Foundation
Hackers Unite!  GUADEC: The world's #1 Open Source Desktop Event.
GNOME Users and Developers European Conference, 28-30th June in Norway
http://2004/guadec.org
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


[Dri-devel] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-04-13 Thread Ronny V. Vindenes
Ian Romanick [EMAIL PROTECTED] writes:

 CVSROOT:  /cvs/mesa
 Module name:  Mesa
 Repository:   Mesa/src/mesa/tnl/
 Changes by:   [EMAIL PROTECTED]   04/04/12 15:40:55
 
 Log message:
   Conditionally compile code for x86 specific TNL codegen.  This fixes problem
   with x86-64 and PowerPC.
   
   Reported by: sublett on #dri-devel.
 

Here are the additional patches needed to get dri building on
x86-64. The mesa linux-x86-64 config is still broken. Also there are
some odd color bugs with r200, some objects turn dark or purple. I see
this with simple programs like glxgears, but not in more complex
things like UT2004.

Index: imports.h
===
RCS file: /cvs/mesa/Mesa/src/mesa/main/imports.h,v
retrieving revision 1.34
diff -u -r1.34 imports.h
--- imports.h	11 Apr 2004 22:22:23 -	1.34
+++ imports.h	13 Apr 2004 09:46:57 -
@@ -222,7 +222,7 @@
  *** USE_IEEE: Determine if we're using IEEE floating point
  ***/
 #if defined(__i386__) || defined(__386__) || defined(__sparc__) || \
-defined(__s390x__) || defined(__powerpc__) || \
+defined(__s390x__) || defined(__powerpc__) || defined(__AMD64__) || \
 ( defined(__alpha__)  ( defined(__IEEE_FLOAT) || !defined(VMS) ) )
 #define USE_IEEE
 #define IEEE_ONE 0x3f80
Index: host.def
===
RCS file: /cvs/dri/xc/xc/config/cf/host.def,v
retrieving revision 1.67
diff -u -r1.67 host.def
--- host.def	9 Apr 2004 00:18:44 -	1.67
+++ host.def	13 Apr 2004 11:17:17 -
@@ -38,6 +38,11 @@
 #define XF86CardDrivers tdfx i810 mga ati glint vga sis
 #define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx ffb
 
+#elif defined(AMD64Architecture)
+
+#define XF86CardDrivers tdfx i810 mga ati glint vga sis
+#define DriDrivers r200 mga i810 r128 radeon gamma i830 sis tdfx
+
 #else
 
 #define XF86CardDrivers tdfx mga ati glint vga
@@ -66,7 +71,7 @@
  * expat.
  */
 
-#if defined(LinuxArchitecture)
+#if defined(LinuxArchitecture)  !defined(AMD64Architecture)
 # define ExpatLibrary		StaticLibrary($(BUILDLIBDIR),expat)
 # define NormalLibExpat 	YES
 #endif
Index: Imakefile.inc
===
RCS file: /cvs/dri/xc/xc/lib/GL/mesa/tnl/Imakefile.inc,v
retrieving revision 1.5
diff -u -r1.5 Imakefile.inc
--- Imakefile.inc	30 Mar 2004 00:22:49 -	1.5
+++ Imakefile.inc	13 Apr 2004 12:44:32 -
@@ -76,7 +76,6 @@
 #if defined(i386Architecture)  MesaUseX86Asm
 #define MesaTnlAsmObjs  $(MESATNLBUILDDIR)t_vtx_x86.o \
 		  $(MESATNLBUILDDIR)t_vtx_x86_gcc.o
-#endif
 
   MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
 		  $(MESATNLBUILDDIR)t_array_import.o \
@@ -100,6 +99,29 @@
 		  $(MESATNLBUILDDIR)t_vtx_exec.o \
 		  MesaTnlAsmObjs \
 		  $(MESATNLBUILDDIR)t_vtx_generic.o
+#else
+  MESA_TNL_OBJS = $(MESATNLBUILDDIR)t_array_api.o \
+  $(MESATNLBUILDDIR)t_array_import.o \
+  $(MESATNLBUILDDIR)t_context.o \
+  $(MESATNLBUILDDIR)t_pipeline.o \
+  $(MESATNLBUILDDIR)t_save_api.o \
+  $(MESATNLBUILDDIR)t_save_loopback.o \
+  $(MESATNLBUILDDIR)t_save_playback.o \
+  $(MESATNLBUILDDIR)t_vb_fog.o \
+  $(MESATNLBUILDDIR)t_vb_light.o \
+  $(MESATNLBUILDDIR)t_vb_normals.o \
+  $(MESATNLBUILDDIR)t_vb_points.o \
+  $(MESATNLBUILDDIR)t_vb_program.o \
+  $(MESATNLBUILDDIR)t_vb_render.o \
+  $(MESATNLBUILDDIR)t_vb_texgen.o \
+  $(MESATNLBUILDDIR)t_vb_texmat.o \
+  $(MESATNLBUILDDIR)t_vb_vertex.o \
+  $(MESATNLBUILDDIR)t_vertex.o \
+  $(MESATNLBUILDDIR)t_vtx_api.o \
+  $(MESATNLBUILDDIR)t_vtx_eval.o \
+  $(MESATNLBUILDDIR)t_vtx_exec.o \
+  $(MESATNLBUILDDIR)t_vtx_generic.o
+#endif
 
 #if defined(DoSharedLib)  DoSharedLib
 #if defined(i386Architecture)  MesaUseX86Asm

-- 
Ronny V. Vindenes [EMAIL PROTECTED]


[Dri-devel] Re: [Mesa3d-dev] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-04-13 Thread Brian Paul
Ronny V. Vindenes wrote:
Ian Romanick [EMAIL PROTECTED] writes:


CVSROOT:/cvs/mesa
Module name:Mesa
Repository: Mesa/src/mesa/tnl/
Changes by: [EMAIL PROTECTED]   04/04/12 15:40:55
Log message:
 Conditionally compile code for x86 specific TNL codegen.  This fixes problem
 with x86-64 and PowerPC.
 
 Reported by: sublett on #dri-devel.



Here are the additional patches needed to get dri building on
x86-64. The mesa linux-x86-64 config is still broken. Also there are
some odd color bugs with r200, some objects turn dark or purple. I see
this with simple programs like glxgears, but not in more complex
things like UT2004.
Thanks.  I've checked in the patches.

-Brian



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Dri-devel] [PATCH] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-03-31 Thread Keith Whitwell
ajax wrote:
On Tuesday 30 March 2004 16:52, Brian Paul wrote:

CVSROOT:/cvs/mesa
Module name:Mesa
Repository: Mesa/src/mesa/main/
Changes by: [EMAIL PROTECTED]   04/03/30 14:52:00
Log message:
 these files now live in the shader directory
Removed files:
 Mesa/src/mesa/main/:
   nvfragparse.c nvfragparse.h nvfragprog.h nvprogram.c
   nvprogram.h nvvertexec.c nvvertexec.h nvvertparse.c
   nvvertparse.h nvvertprog.h


This breaks the DRI build:

s_aatriangle.c:37:24: nvfragprog.h: No such file or directory

Patch attached, which adds src/mesa/shader everywhere it's needed.  This is a 
bit heavy-handed; would it be better to factor $MESA_INCLUDES up to a higher 
Imakefile?
I've committed most of this (where it didn't clash with changes I've already 
made).

The build seems to work for me now, here.  Let me know what happens on your end.

Keith



---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Dri-devel] [PATCH] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-03-31 Thread ajax
On Wednesday 31 March 2004 04:48, Keith Whitwell wrote:

 I've committed most of this (where it didn't clash with changes I've
 already made).

 The build seems to work for me now, here.  Let me know what happens on your
 end.

 Keith

Builds fine here, including radeon and r200.  Thanks.  (tdfx still needs 
patching for COMMONOBJS and USE_NEW_INTERFACE, but those are runtime not 
buildtime.)

- ajax


---
This SF.Net email is sponsored by: IBM Linux Tutorials
Free Linux tutorial presented by Daniel Robbins, President and CEO of
GenToo technologies. Learn everything from fundamentals to system
administration.http://ads.osdn.com/?ad_id=1470alloc_id=3638op=click
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


[Dri-devel] [PATCH] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-03-30 Thread ajax
On Tuesday 30 March 2004 16:52, Brian Paul wrote:
 CVSROOT:  /cvs/mesa
 Module name:  Mesa
 Repository:   Mesa/src/mesa/main/
 Changes by:   [EMAIL PROTECTED]   04/03/30 14:52:00

 Log message:
   these files now live in the shader directory

 Removed files:
   Mesa/src/mesa/main/:
 nvfragparse.c nvfragparse.h nvfragprog.h nvprogram.c
 nvprogram.h nvvertexec.c nvvertexec.h nvvertparse.c
 nvvertparse.h nvvertprog.h

This breaks the DRI build:

s_aatriangle.c:37:24: nvfragprog.h: No such file or directory

Patch attached, which adds src/mesa/shader everywhere it's needed.  This is a 
bit heavy-handed; would it be better to factor $MESA_INCLUDES up to a higher 
Imakefile?

- ajax
--- xc/lib/GL/mesa/array_cache/Imakefile	2004-03-30 19:16:02.0 -0600
+++ xc/lib/GL/mesa/array_cache/Imakefile	2004-03-30 19:16:38.0 -0600
@@ -45,6 +45,7 @@
 		-I$(MESASRCDIR)/src/mesa/array_cache \
 		-I$(MESASRCDIR)/src/mesa/glapi \
 		-I$(MESASRCDIR)/src/mesa/math \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/include \
 		-I../../../include -I$(XINCLUDESRC)
--- xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc	2004-03-30 19:35:01.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/common/Imakefile.inc	2004-03-30 19:34:08.0 -0600
@@ -32,6 +32,7 @@
 COMMON_MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/../common \
 		-I$(MESASRCDIR)/include
--- xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc	2004-03-30 19:16:38.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/ffb/Imakefile.inc	2004-03-30 19:16:50.0 -0600
@@ -30,6 +30,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/ffb
--- xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc	2004-03-30 19:16:50.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/gamma/Imakefile.inc	2004-03-30 19:17:02.0 -0600
@@ -31,6 +31,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/gamma
--- xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc	2004-03-30 19:17:02.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/i810/Imakefile.inc	2004-03-30 19:17:09.0 -0600
@@ -31,6 +31,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/i810
--- xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc	2004-03-30 19:17:09.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/i830/Imakefile.inc	2004-03-30 19:17:20.0 -0600
@@ -31,6 +31,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/i830
--- xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc	2004-03-30 19:17:20.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/mga/Imakefile.inc	2004-03-30 19:17:27.0 -0600
@@ -31,6 +31,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/mga
--- xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc	2004-03-30 19:17:27.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/r128/Imakefile.inc	2004-03-30 19:17:34.0 -0600
@@ -32,6 +32,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/r128
--- xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc	2004-03-30 19:17:34.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/r200/Imakefile.inc	2004-03-30 19:17:39.0 -0600
@@ -32,6 +32,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 		-I$(MESADRVSRCDIR)/r200
--- xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc	2004-03-30 19:17:39.0 -0600
+++ xc/lib/GL/mesa/drivers/dri/radeon/Imakefile.inc	2004-03-30 19:17:46.0 -0600
@@ -32,6 +32,7 @@
 MESA_INCLUDES = -I$(MESASRCDIR)/src/mesa \
 		-I$(MESASRCDIR)/src/mesa/main \
 		-I$(MESASRCDIR)/src/mesa/glapi \
+		-I$(MESASRCDIR)/src/mesa/shader \
 		-I$(MESASRCDIR)/include \
 		-I$(MESADRVSRCDIR)/common \
 	

[Dri-devel] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-02-25 Thread Ian Romanick
Ian Romanick wrote:

Log message:
  Create all the right modes for 16-bit screens.
Modified files:
  Mesa/src/mesa/drivers/dri/r200/:
r200_screen.c 
I made one change here that I want to be sure about.  I marked fbconfigs 
with 16-bit depth buffer and a stencil buffer as GLX_SLOW_CONFIG.  That 
is *not* what the 2D driver in the trunk does.  I want to make sure that 
the R100  R200 can't do a separate stencil buffer or something before I 
update the 2D driver. :)

After similar changes are made to the r100  mga drivers, I believe the 
branch will be ready to merge to the trunk.  My plan is to do the merge 
on Monday right after the IRC meeting.  Any objections?



---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps  Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel


Re: [Dri-devel] Re: [Mesa3d-cvs] CVS Update: Mesa (branch: trunk)

2004-02-25 Thread Michel Dänzer
On Thu, 2004-02-26 at 01:38, Ian Romanick wrote:
 Ian Romanick wrote:
 
  Log message:
Create all the right modes for 16-bit screens.
  
  Modified files:
Mesa/src/mesa/drivers/dri/r200/:
  r200_screen.c 
 
 I made one change here that I want to be sure about.  I marked fbconfigs 
 with 16-bit depth buffer and a stencil buffer as GLX_SLOW_CONFIG.  That 
 is *not* what the 2D driver in the trunk does.  

I noticed that and wanted to post about it but seem to have forgotten.

 I want to make sure that the R100  R200 can't do a separate stencil 
 buffer or something before I update the 2D driver. :)

No, the hardware enforces a 24 bit depth buffer when stencil is enabled.


-- 
Earthling Michel Dnzer  | Debian (powerpc), X and DRI developer
Libre software enthusiast|   http://svcs.affero.net/rm.php?r=daenzer



---
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps  Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356alloc_id=3438op=click
--
___
Dri-devel mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/dri-devel