Merge commit 'origin/gallium-0.1' into gallium-0.2

Conflicts:

	Makefile
	progs/demos/Makefile
	progs/glsl/Makefile
	progs/redbook/Makefile
	progs/samples/Makefile
	progs/tests/Makefile
	progs/trivial/Makefile
	progs/xdemos/Makefile
	src/gallium/Makefile
	src/mesa/main/attrib.c
	src/mesa/main/bufferobj.c
	src/mesa/vbo/vbo_exec_draw.c

diff --cc Makefile
Simple merge

diff --cc configs/default
index a6ac0b7,94582d8..2b0eb19
--- 1/configs/default
--- 2/configs/default
+++ b/configs/default
@@@ -22,12 -21,13 +22,16 @@@ CXX = C
  HOST_CC = $(CC)
  CFLAGS = -O
  CXXFLAGS = -O
 +LDFLAGS =
  GLU_CFLAGS = 
  
+ # Compiler for building demos/tests/etc
+ APP_CC = $(CC)
+ APP_CXX = $(CXX)
+ 
  # Misc tools and flags
 +SHELL = /bin/sh
 +MKLIB = $(SHELL) $(TOP)/bin/mklib
  MKLIB_OPTIONS = 
  MKDEP = makedepend
  MKDEP_OPTIONS = -fdepend

diff --cc progs/demos/Makefile
index 81d9ebe,fe0e0fb..43cab1a
--- 1/progs/demos/Makefile
--- 2/progs/demos/Makefile
+++ b/progs/demos/Makefile
@@@ -81,7 -74,7 +81,7 @@@ PROGS = 
  
  # make executable from .c file:
  .c: $(LIB_DEP) readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< readtex.o $(APP_LIB_DEPS) -o $@
  
  
  ##### TARGETS #####
@@@ -125,51 -118,39 +125,51 @@@ extfuncs.h:  $(TOP)/progs/util/extfuncs
  
  
  reflect: reflect.o showbuffer.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) reflect.o showbuffer.o readtex.o $(APP_LIB_DEPS) $(ARCH_FLAGS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) reflect.o showbuffer.o readtex.o $(LIBS) -o $@
  
  reflect.o: reflect.c showbuffer.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) reflect.c
  
  
  shadowtex: shadowtex.o showbuffer.o
-       $(CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
 -      $(APP_CC) shadowtex.o showbuffer.o $(APP_LIB_DEPS) $(ARCH_FLAGS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) shadowtex.o showbuffer.o $(LIBS) -o $@
  
  shadowtex.o: shadowtex.c showbuffer.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) shadowtex.c
  
  
  gloss: gloss.o trackball.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) gloss.o trackball.o readtex.o $(APP_LIB_DEPS) $(ARCH_FLAGS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) gloss.o trackball.o readtex.o $(LIBS) -o $@
  
  gloss.o: gloss.c trackball.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) gloss.c
  
  
  engine: engine.o trackball.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) engine.o trackball.o readtex.o $(APP_LIB_DEPS) $(ARCH_FLAGS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) engine.o trackball.o readtex.o $(LIBS) -o $@
  
  engine.o: engine.c trackball.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) engine.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) engine.c
  
  
  fslight: fslight.o
-       $(CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@
 -      $(APP_CC) fslight.o $(APP_LIB_DEPS) $(ARCH_FLAGS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) fslight.o $(LIBS) -o $@
  
  fslight.o: fslight.c extfuncs.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) fslight.c
  
 +rain: particles.o rain.o readtex.o
 +      $(CXX) $(CXXFLAGS) $(LDFLAGS) $^ $(LIBS) -o $@
 +
 +rain.o: rain.cxx readtex.h
 +      $(CXX) -c -I$(INCDIR) $(CXXFLAGS) $<
 +
 +particles.o: particles.cxx
 +      $(CXX) -c -I$(INCDIR) $(CXXFLAGS) $<
 +
 +
 +viewdds: viewdds.c
 +      $(CC) -I$(INCDIR) $(CFLAGS) $< readtex.o $(LIBS) -L. -lgltc -o $@
  
  
  clean:

diff --cc progs/glsl/Makefile
index ba7a4c6,9c1d3f8..5cb2a04
--- 1/progs/glsl/Makefile
--- 2/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@@ -36,7 -26,7 +36,7 @@@ PROGS = 
  
  # make executable from .c file:
  .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  
  ##### TARGETS #####
@@@ -58,123 -47,27 +58,122 @@@ readtex.h: $(TOP)/progs/util/readtex.
        cp $< .
  
  readtex.o: readtex.c readtex.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) readtex.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) readtex.c
  
 -brick.c: extfuncs.h
  
 -bump.c: extfuncs.h
 +shaderutil.c: $(TOP)/progs/util/shaderutil.c
 +      cp $< .
 +
 +shaderutil.h: $(TOP)/progs/util/shaderutil.h
 +      cp $< .
 +
 +shaderutil.o: shaderutil.c shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) shaderutil.c
 +
 +
 +
 +bitmap.o: bitmap.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) bitmap.c
 +
 +bitmap: bitmap.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bitmap.o shaderutil.o $(LIBS) -o $@
 +
 +
 +brick.o: brick.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) brick.c
 +
 +brick: brick.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) brick.o shaderutil.o $(LIBS) -o $@
 +
 +
 +bump.o: bump.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) bump.c
 +
 +bump: bump.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) bump.o shaderutil.o $(LIBS) -o $@
 +
 +
 +convolutions.o: convolutions.c readtex.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
 +
 +convolutions: convolutions.o readtex.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) convolutions.o readtex.o $(LIBS) -o $@
 +
 +
 +deriv.o: deriv.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) deriv.c
 +
 +deriv: deriv.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) deriv.o shaderutil.o $(LIBS) -o $@
 +
 +
 +mandelbrot.o: mandelbrot.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) mandelbrot.c
 +
 +mandelbrot: mandelbrot.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) mandelbrot.o shaderutil.o $(LIBS) -o $@
 +
- 
 +multitex.o: multitex.c extfuncs.h readtex.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) multitex.c
 +
 +multitex: multitex.o readtex.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) multitex.o readtex.o shaderutil.o $(LIBS) -o $@
 +
 +
 +noise.o: noise.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) noise.c
 +
 +noise: noise.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) noise.o shaderutil.o $(LIBS) -o $@
 +
 +
 +points.o: points.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) points.c
 +
 +points: points.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) points.o shaderutil.o $(LIBS) -o $@
 +
 +
 +pointcoord.o: pointcoord.c readtex.h extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) pointcoord.c
 +
 +pointcoord: pointcoord.o readtex.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) pointcoord.o readtex.o shaderutil.o $(LIBS) -o $@
 +
 +
 +texdemo1.o: texdemo1.c readtex.h extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
 +
 +texdemo1: texdemo1.o readtex.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) texdemo1.o readtex.o shaderutil.o $(LIBS) -o $@
 +
 +
 +toyball.o: toyball.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) toyball.c
 +
 +toyball: toyball.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) toyball.o shaderutil.o $(LIBS) -o $@
 +
 +
 +twoside.o: twoside.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) twoside.c
 +
 +twoside: twoside.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) twoside.o shaderutil.o $(LIBS) -o $@
  
 -mandelbrot.c: extfuncs.h
  
 -toyball.c: extfuncs.h
 +trirast.o: trirast.c extfuncs.h shaderutil.h
 +      $(CC) -c -I$(INCDIR) $(CFLAGS) trirast.c
  
 -texdemo1: texdemo1.o readtex.o
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) texdemo1.o readtex.o $(APP_LIB_DEPS) -o $@
 +trirast: trirast.o shaderutil.o
 +      $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) trirast.o shaderutil.o $(LIBS) -o $@
  
 -texdemo1.o: texdemo1.c readtex.h extfuncs.h
 -      $(APP_CC) -c -I$(INCDIR) $(CFLAGS) texdemo1.c
  
  convolutions: convolutions.o readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) convolutions.o readtex.o $(APP_LIB_DEPS) -o $@
+       $(APP_CC) -I$(INCDIR) $(CFLAGS) convolutions.o readtex.o $(APP_LIB_DEPS) -o $@
  
  convolutions.o: convolutions.c readtex.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) convolutions.c
  
  
  clean:

diff --cc progs/redbook/Makefile
index 7ba676c,956c398..0ba5fbb
--- 1/progs/redbook/Makefile
--- 2/progs/redbook/Makefile
+++ b/progs/redbook/Makefile
@@@ -26,7 -24,7 +26,7 @@@ PROGS = aaindex aapoly aargb accanti ac
  .SUFFIXES: .c
  
  .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  
  

diff --cc progs/samples/Makefile
index 6509a55,25ce147..63dca07
--- 1/progs/samples/Makefile
--- 2/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@@ -20,7 -18,7 +20,7 @@@ PROGS = accum bitmap1 bitmap2 blendeq b
  .SUFFIXES: .c
  
  .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  
  ##### TARGETS #####
@@@ -29,10 -27,10 +29,10 @@@ default: $(PROGS
  
  
  sphere: sphere.o readtex.o
-       $(CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) sphere.o readtex.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(CFLAGS) $(LDFLAGS) sphere.o readtex.o $(LIBS) -o $@
  
  sphere.o: sphere.c readtex.h
-       $(CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
+       $(APP_CC) -c -I$(INCDIR) $(CFLAGS) sphere.c
  
  readtex.c: $(TOP)/progs/util/readtex.c
        cp $< .

diff --cc progs/tests/Makefile
index b111154,9c81f87..94473fc
--- 1/progs/tests/Makefile
--- 2/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@@ -116,14 -103,25 +117,14 @@@ clean
  .SUFFIXES: .c
  
  .c:
-       $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
++      $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  .c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  .S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
  
 -
 -##### TARGETS #####
 -
 -default: $(UTIL_FILES) $(PROGS)
 -
 -clean:
 -      rm -f $(PROGS)
 -      rm -f *.o
 -      rm -f getproclist.h
 -
 -
  # auto code generation
  getprocaddress: getprocaddress.c getproclist.h
  
@@@ -131,46 -129,46 +132,46 @@@ getproclist.h: $(TOP)/src/mesa/glapi/gl
        python getprocaddress.py > getproclist.h
  
  arraytexture: arraytexture.o readtex.o
-       $(CC) $(CFLAGS) arraytexture.o readtex.o $(LIBS) -o $@
+       $(APP_CC) $(CFLAGS) arraytexture.o readtex.o $(LIBS) -o $@
  
  arraytexture.o: arraytexture.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) arraytexture.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) arraytexture.c -o $@
  
  afsmultiarb: afsmultiarb.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) afsmultiarb.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) $(CFLAGS) afsmultiarb.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) afsmultiarb.o readtex.o $(LIBS) -o $@
  
  afsmultiarb.o: afsmultiarb.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) afsmultiarb.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) afsmultiarb.c -o $@
  
  drawbuffers: drawbuffers.o
-       $(CC) $(CFLAGS) $(LDFLAGS) drawbuffers.o $(LIBS) -o $@
 -      $(APP_CC) $(CFLAGS) drawbuffers.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) drawbuffers.o $(LIBS) -o $@
  
  drawbuffers.o: drawbuffers.c extfuncs.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) drawbuffers.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) drawbuffers.c -o $@
  
  texrect: texrect.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) $(CFLAGS) texrect.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
  
  texrect.o: texrect.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) texrect.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) texrect.c -o $@
  
  bug_3195: bug_3195.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) bug_3195.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) $(CFLAGS) bug_3195.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) bug_3195.o readtex.o $(LIBS) -o $@
  
  bug_3195.o: bug_3195.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) bug_3195.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) bug_3195.c -o $@
  
  invert: invert.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) $(CFLAGS) invert.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
  
  invert.o: invert.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) invert.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) invert.c -o $@
  
  mipmap_view: mipmap_view.o readtex.o
-       $(CC) $(CFLAGS) mipmap_view.o readtex.o $(LIBS) -o $@
+       $(APP_CC) $(CFLAGS) mipmap_view.o readtex.o $(LIBS) -o $@
  
  mipmap_view.o: mipmap_view.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  
  fillrate: fillrate.o readtex.o
@@@ -182,7 -180,7 +183,7 @@@ fillrate.o: fillrate.c readtex.
  
  
  readtex.o: readtex.c
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) readtex.c -o $@
 -      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
++      $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) readtex.c -o $@
  
  
  readtex.h: $(TOP)/progs/util/readtex.h

diff --cc progs/trivial/Makefile
index 01475f9,c868ab6..95223e4
--- 1/progs/trivial/Makefile
--- 2/progs/trivial/Makefile
+++ b/progs/trivial/Makefile
@@@ -138,13 -139,13 +139,13 @@@ UTIL_FILES = readtex.h readtex.
  .SUFFIXES: .c
  
  .c:
-       $(CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) $(INCLUDES) $(CFLAGS) $< $(LIBS) -o $@
++      $(APP_CC) $(INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  .c.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  .S.o:
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES)  $< -o $@
  
  
  ##### TARGETS #####
@@@ -165,19 -166,19 +166,19 @@@ getproclist.h: $(TOP)/src/mesa/glapi/gl
  
  
  texrect: texrect.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) texrect.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) texrect.o readtex.o $(LIBS) -o $@
  
  texrect.o: texrect.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  invert: invert.o readtex.o
-       $(CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
 -      $(APP_CC) invert.o readtex.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) invert.o readtex.o $(LIBS) -o $@
  
  invert.o: invert.c readtex.h
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  readtex.o: readtex.c
-       $(CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
+       $(APP_CC) -c $(INCLUDES) $(CFLAGS) $(DEFINES) $< -o $@
  
  
  readtex.h: $(TOP)/progs/util/readtex.h

diff --cc progs/xdemos/Makefile
index b259671,38f3884..b314324
--- 1/progs/xdemos/Makefile
--- 2/progs/xdemos/Makefile
+++ b/progs/xdemos/Makefile
@@@ -49,7 -39,7 +49,7 @@@ EXTRA_PROGS = 
  .SUFFIXES: .c
  
  .c: $(LIB_DEP)
-       $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) $< $(APP_LIB_DEPS) -o $@
++      $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $(LDFLAGS) $< $(LIBS) -o $@
  
  
  ##### TARGETS #####
@@@ -67,44 -54,32 +67,44 @@@ clean
  
  # special cases
  pbinfo: pbinfo.o pbutil.o
-       $(CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) pbinfo.o pbutil.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) pbinfo.o pbutil.o $(LIBS) -o $@
  
  pbdemo: pbdemo.o pbutil.o
-       $(CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) pbdemo.o pbutil.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) pbdemo.o pbutil.o $(LIBS) -o $@
  
  pbinfo.o: pbinfo.c pbutil.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c
 -      $(APP_CC) -c -I. -I$(INCDIR) $(CFLAGS) pbinfo.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbinfo.c
  
  pbdemo.o: pbdemo.c pbutil.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbdemo.c
 -      $(APP_CC) -c -I. -I$(INCDIR) $(CFLAGS) pbdemo.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbdemo.c
  
  pbutil.o: pbutil.c pbutil.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c
 -      $(APP_CC) -c -I. -I$(INCDIR) $(CFLAGS) pbutil.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) pbutil.c
  
  glxgears_fbconfig: glxgears_fbconfig.o pbutil.o
-       $(CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) glxgears_fbconfig.o pbutil.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) glxgears_fbconfig.o pbutil.o $(LIBS) -o $@
  
  glxgears_fbconfig.o: glxgears_fbconfig.c pbutil.h
-       $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
++      $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) -c -I. $(CFLAGS) glxgears_fbconfig.c
  
  xrotfontdemo: xrotfontdemo.o xuserotfont.o
-       $(CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
 -      $(APP_CC) -I$(INCDIR) $(CFLAGS) xrotfontdemo.o xuserotfont.o $(APP_LIB_DEPS) -o $@
++      $(APP_CC) $(CFLAGS) $(LDFLAGS) xrotfontdemo.o xuserotfont.o $(LIBS) -o $@
  
  xuserotfont.o: xuserotfont.c xuserotfont.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c
 -      $(APP_CC) -c -I. -I$(INCDIR) $(CFLAGS) xuserotfont.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xuserotfont.c
  
  xrotfontdemo.o: xrotfontdemo.c xuserotfont.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c
 -      $(APP_CC) -c -I. -I$(INCDIR) $(CFLAGS) xrotfontdemo.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) xrotfontdemo.c
 +
 +corender: corender.o ipc.o
-       $(CC) $(CFLAGS) corender.o ipc.o $(LIBS) -o $@
++      $(APP_CC) $(CFLAGS) corender.o ipc.o $(LIBS) -o $@
 +
 +corender.o: corender.c ipc.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) corender.c
 +
 +ipc.o: ipc.c ipc.h
-       $(CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c
++      $(APP_CC) -c -I. -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) ipc.c
 +
 +yuvrect_client: yuvrect_client.c
-       $(CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@
++      $(APP_CC) -I$(INCDIR) $(X11_INCLUDES) $(CFLAGS) $< $(LDFLAGS) $(LIBS) -l$(GLU_LIB) -o $@
  

diff --cc src/glut/glx/glut_event.c
Simple merge

diff --cc src/mesa/shader/prog_statevars.c
Simple merge

diff --cc src/mesa/shader/prog_statevars.h
Simple merge

diff --cc src/mesa/vbo/vbo_exec_draw.c
index 1d095c7,f497e9a..7ec431a
--- 1/src/mesa/vbo/vbo_exec_draw.c
--- 2/src/mesa/vbo/vbo_exec_draw.c
+++ b/src/mesa/vbo/vbo_exec_draw.c
@@@ -188,7 -188,18 +188,19 @@@ static void vbo_exec_bind_arrays( GLcon
           /* override the default array set above */
           exec->vtx.inputs[attr] = &arrays[attr];
  
-        arrays[attr].Ptr = (void *)data;
+          if (exec->vtx.bufferobj->Name) {
+             /* a real buffer obj: Ptr is an offset, not a pointer*/
+             int offset;
+             assert(exec->vtx.bufferobj->Pointer);  /* buf should be mapped */
+             offset = (GLbyte *) data - (GLbyte *) exec->vtx.bufferobj->Pointer;
+             assert(offset >= 0);
+             arrays[attr].Ptr = (void *) offset;
+          }
+          else {
+             /* Ptr into ordinary app memory */
+             arrays[attr].Ptr = (void *) data;
+          }
++
         arrays[attr].Size = exec->vtx.attrsz[src];
         arrays[attr].StrideB = exec->vtx.vertex_size * sizeof(GLfloat);
         arrays[attr].Stride = exec->vtx.vertex_size * sizeof(GLfloat);