mesa: set version string to 7.6.1-rc3

progs/demos: Fix memory leak in projtex.c.
st/egl: Fix memory leak in egl_tracker.c.
2009-12-07 16:59:59 -08:00 · 2009-12-07 12:31:08 -08:00 · 2009-12-06 01:15:24 -08:00 · 2009-12-06 01:01:55 -08:00 · 2009-12-06 01:00:20 -08:00 · 2009-12-06 00:56:20 -08:00
181 changed files with 365 additions and 278 deletions
--- a/common.py
+++ b/common.py
@@ -59,7 +59,7 @@ def AddOptions(opts):
 	opts.Add(EnumOption('machine', 'use machine-specific assembly code', default_machine,
 											 allowed_values=('generic', 'ppc', 'x86', 'x86_64')))
 	opts.Add(EnumOption('platform', 'target platform', default_platform,
-											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince')))
+											 allowed_values=('linux', 'cell', 'windows', 'winddk', 'wince', 'darwin')))
 	opts.Add(EnumOption('toolchain', 'compiler toolchain', 'default',
 											 allowed_values=('default', 'crossmingw', 'winsdk', 'winddk')))
 	opts.Add(BoolOption('llvm', 'use LLVM', 'no'))
--- a/docs/relnotes-7.6.1.html
+++ b/docs/relnotes-7.6.1.html
@@ -56,6 +56,8 @@ tbd
 <li>Fixed clipping / provoking vertex bugs in i965 driver.
 <li>Assorted build fixes for AIX.
 <li>Endianness fixes for the DRI swrast driver (bug 22767).</li>
+<li>Point sprite fixes for i915/945 driver.
+<li>Fixed assorted memory leaks (usually on error paths)
 </ul>

 <h2>Changes</h2>
--- a/progs/.gitignore
+++ b/progs/.gitignore
@@ -0,0 +1 @@
+*.dSYM
--- a/progs/Makefile
+++ b/progs/Makefile
@@ -4,7 +4,7 @@ TOP = ..

 include $(TOP)/configs/current

-SUBDIRS = "$(strip "$(PROGRAM_DIRS)")"
+SUBDIRS = $(PROGRAM_DIRS)


 default: message subdirs
@@ -15,22 +15,18 @@ message:


 subdirs:
-	@if test -n "$(SUBDIRS)" ; then \
-		for dir in $(SUBDIRS) ; do \
-			if [ -d $$dir ] ; then \
-				(cd $$dir && $(MAKE)) || exit 1 ; \
-			fi \
-		done \
-	fi
+	@list='$(SUBDIRS)'; for dir in $$list ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE)) || exit 1 ; \
+		fi \
+	done

 # Dummy install target
 install:

 clean:
-	-@if test -n "$(SUBDIRS)" ; then \
-		for dir in $(SUBDIRS) tests ; do \
-			if [ -d $$dir ] ; then \
-				(cd $$dir && $(MAKE) clean) ; \
-			fi \
-		done \
-	fi
+	@list='$(SUBDIRS)'; for dir in $$list tests ; do \
+		if [ -d $$dir ] ; then \
+			(cd $$dir && $(MAKE) clean) ; \
+		fi \
+	done
--- a/progs/demos/fogcoord.c
+++ b/progs/demos/fogcoord.c
@@ -15,8 +15,6 @@

 #define DEPTH 5.0f

-static PFNGLFOGCOORDPOINTEREXTPROC glFogCoordPointer_ext;
-
 static GLfloat camz;

 static GLint fogMode;
--- a/progs/demos/fslight.c
+++ b/progs/demos/fslight.c
@@ -353,6 +353,7 @@ MakeSphere(void)
   glNewList(SphereList, GL_COMPILE);
   gluSphere(obj, 2.0f, 10, 5);
   glEndList();
+   gluDeleteQuadric(obj);
 }

 static void
--- a/progs/demos/ipers.c
+++ b/progs/demos/ipers.c
@@ -133,6 +133,8 @@ initdlists(void)

      glEndList();
   }
+
+   gluDeleteQuadric(obj);
 }

 static void
--- a/progs/demos/projtex.c
+++ b/progs/demos/projtex.c
@@ -245,6 +245,10 @@ loadImageTextures(void)
       glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
     }
     glTexParameterfv(GL_TEXTURE_2D, GL_TEXTURE_BORDER_COLOR, borderColor);
+
+     free(texData3);
+     free(texData4);
+     free(image);
  }
 }

--- a/progs/demos/ray.c
+++ b/progs/demos/ray.c
@@ -834,6 +834,8 @@ initdlists(void)
   gluQuadricTexture(obj, GL_TRUE);
   gluSphere(obj, SPHERE_RADIUS, 16, 16);
   glEndList();
+
+   gluDeleteQuadric(obj);
 }

 int
--- a/progs/fp/Makefile
+++ b/progs/fp/Makefile
@@ -17,6 +17,7 @@ SOURCES = \
 	tri-depth2.c \
 	tri-depthwrite.c \
 	tri-depthwrite2.c \
+	tri-inv.c \
        tri-param.c \
        fp-tri.c

--- a/progs/fp/fp-tri.c
+++ b/progs/fp/fp-tri.c
@@ -197,7 +197,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/point-position.c
+++ b/progs/fp/point-position.c
@@ -55,7 +55,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-depth.c
+++ b/progs/fp/tri-depth.c
@@ -57,7 +57,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-depth2.c
+++ b/progs/fp/tri-depth2.c
@@ -59,7 +59,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-depthwrite.c
+++ b/progs/fp/tri-depthwrite.c
@@ -55,7 +55,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-depthwrite2.c
+++ b/progs/fp/tri-depthwrite2.c
@@ -55,7 +55,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-inv.c
+++ b/progs/fp/tri-inv.c
@@ -56,7 +56,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-param.c
+++ b/progs/fp/tri-param.c
@@ -54,7 +54,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/fp/tri-tex.c
+++ b/progs/fp/tri-tex.c
@@ -76,7 +76,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/glsl/CH18-mandel.frag
+++ b/progs/glsl/CH18-mandel.frag
@@ -31,7 +31,7 @@ void main()
    float iter;

 //    for (iter = 0.0; iter < MaxIterations && r2 < 4.0; ++iter)
-    for (iter = 0.0; iter < 12 && r2 < 4.0; ++iter)
+    for (iter = 0.0; iter < 12.0 && r2 < 4.0; ++iter)
    {
        float tempreal = real;

--- a/progs/glsl/Makefile
+++ b/progs/glsl/Makefile
@@ -10,16 +10,15 @@ LIB_DEP = \
 	$(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) \
 	$(TOP)/$(LIB_DIR)/$(GLUT_LIB_NAME)

-LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)
-
-INCLUDE_DIRS = -I$(TOP)/progs/util
+LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) \
+	-l$(GL_LIB) $(APP_LIB_DEPS)

 # using : to avoid APP_CC pointing to CC loop
-CC:=$(APP_CC)
-CFLAGS += -I$(INCDIR)
-LDLIBS=$(LIBS)
+CC := $(APP_CC)
+CFLAGS := -I$(INCDIR) $(CFLAGS)
+LDLIBS = $(LIBS)

-DEMO_SOURCES = \
+PROG_SOURCES = \
 	array.c \
 	bitmap.c \
 	brick.c \
@@ -59,8 +58,8 @@ UTIL_SOURCES = \
 	readtex.c

 UTIL_OBJS = $(UTIL_SOURCES:.c=.o)
-PROG_OBJS = $(DEMO_SOURCES:.c=.o)
-PROGS = $(DEMO_SOURCES:%.c=%)
+PROG_OBJS = $(PROG_SOURCES:.c=.o)
+PROGS = $(PROG_SOURCES:%.c=%)

 ##### TARGETS #####

--- a/progs/glsl/bump.c
+++ b/progs/glsl/bump.c
@@ -36,7 +36,7 @@ static GLint win = 0;

 static GLfloat xRot = 20.0f, yRot = 0.0f, zRot = 0.0f;

-static GLuint tangentAttrib;
+static GLint tangentAttrib;

 static GLboolean Anim = GL_FALSE;

--- a/progs/glsl/convolutions.c
+++ b/progs/glsl/convolutions.c
@@ -369,7 +369,7 @@ static void keyPress(unsigned char key, int x, int y)
   case 27:
      exit(0);
   default:
-      return;
+      break;
   }
   glutPostRedisplay();
 }
--- a/progs/glsl/deriv.c
+++ b/progs/glsl/deriv.c
@@ -140,6 +140,7 @@ MakeSphere(void)
   glNewList(SphereList, GL_COMPILE);
   gluSphere(obj, 2.0f, 30, 15);
   glEndList();
+   gluDeleteQuadric(obj);
 }


--- a/progs/glsl/multinoise.c
+++ b/progs/glsl/multinoise.c
@@ -22,22 +22,22 @@ static const char *FragShaderText[ 4 ] = {
   "void main()\n"
   "{\n"
   "   gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].w ) * 0.5 + 0.5;\n"
-   "   gl_FragColor.a = 1;\n"
+   "   gl_FragColor.a = 1.0;\n"
   "}\n",
   "void main()\n"
   "{\n"
   "   gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xw ) * 0.5 + 0.5;\n"
-   "   gl_FragColor.a = 1;\n"
+   "   gl_FragColor.a = 1.0;\n"
   "}\n",
   "void main()\n"
   "{\n"
   "   gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyw ) * 0.5 + 0.5;\n"
-   "   gl_FragColor.a = 1;\n"
+   "   gl_FragColor.a = 1.0;\n"
   "}\n",
   "void main()\n"
   "{\n"
   "   gl_FragColor.rgb = noise3( gl_TexCoord[ 0 ].xyzw ) * 0.5 + 0.5;\n"
-   "   gl_FragColor.a = 1;\n"
+   "   gl_FragColor.a = 1.0;\n"
   "}\n"
 };
    
@@ -125,6 +125,7 @@ Key(unsigned char key, int x, int y)
   case 'a':
      Anim = !Anim;
      glutIdleFunc(Anim ? Idle : NULL);
+      break;
   case 's':
      Slice -= step;
      break;
@@ -193,7 +194,7 @@ LoadAndCompileShader(GLuint shader, const char *text)
      GLchar log[1000];
      GLsizei len;
      glGetShaderInfoLog(shader, 1000, &len, log);
-      fprintf(stderr, "noise: problem compiling shader: %s\n", log);
+      fprintf(stderr, "multinoise: problem compiling shader: %s\n", log);
      exit(1);
   }
   else {
--- a/progs/glsl/noise.c
+++ b/progs/glsl/noise.c
@@ -28,7 +28,7 @@ static const char *FragShaderText =
   "   vec4 p;\n"
   "   p.xy = gl_TexCoord[0].xy;\n"
   "   p.z = Slice;\n"
-   "   p.w = 0;\n"
+   "   p.w = 0.0;\n"
   "   vec4 n = noise4(p * scale);\n"
   "   gl_FragColor = n * Scale + Bias;\n"
   "}\n";
@@ -119,6 +119,7 @@ Key(unsigned char key, int x, int y)
   case 'a':
      Anim = !Anim;
      glutIdleFunc(Anim ? Idle : NULL);
+      break;
   case 's':
      Slice -= step;
      break;
--- a/progs/glsl/trirast.c
+++ b/progs/glsl/trirast.c
@@ -179,9 +179,9 @@ Init(void)
      "\n"
      "void main() {\n"
      "   vec2 p = gl_FragCoord.xy; \n"
-      "   if (crs(v1 - v0, p - v0) >= 0 && \n"
-      "       crs(v2 - v1, p - v1) >= 0 && \n"
-      "       crs(v0 - v2, p - v2) >= 0) \n"
+      "   if (crs(v1 - v0, p - v0) >= 0.0 && \n"
+      "       crs(v2 - v1, p - v1) >= 0.0 && \n"
+      "       crs(v0 - v2, p - v2) >= 0.0) \n"
      "      gl_FragColor = vec4(1.0); \n"
      "   else \n"
      "      gl_FragColor = vec4(0.5); \n"
--- a/progs/redbook/quadric.c
+++ b/progs/redbook/quadric.c
@@ -116,6 +116,8 @@ void init(void)
   glNewList(startList+3, GL_COMPILE);
      gluPartialDisk(qobj, 0.0, 1.0, 20, 4, 0.0, 225.0);
   glEndList();
+
+   gluDeleteQuadric(qobj);
 }

 void display(void)
--- a/progs/samples/Makefile
+++ b/progs/samples/Makefile
@@ -10,7 +10,7 @@ LIB_DEP = $(TOP)/$(LIB_DIR)/$(GL_LIB_NAME) $(TOP)/$(LIB_DIR)/$(GLU_LIB_NAME) $(T
 LIBS = -L$(TOP)/$(LIB_DIR) -l$(GLUT_LIB) -l$(GLEW_LIB) -l$(GLU_LIB) -l$(GL_LIB) $(APP_LIB_DEPS)

 PROGS = accum bitmap1 bitmap2 blendeq blendxor copy cursor depth eval fog \
-	font line logo nurb olympic overlay point prim quad select \
+	font line logo nurb olympic overlay point prim rgbtoppm quad select \
 	shape sphere star stencil stretch texture tri wave


--- a/progs/samples/rgbtoppm.c
+++ b/progs/samples/rgbtoppm.c
@@ -86,7 +86,8 @@ static ImageRec *ImageOpen(char *fileName)
        exit(1);
    }
    if ((image->file = fopen(fileName, "rb")) == NULL) {
-	return NULL;
+        free(image);
+        return NULL;
    }

    fread(image, 1, 12, image->file);
@@ -224,6 +225,7 @@ read_rgb_texture(char *name, int *width, int *height)
      if (gbuf) free(gbuf);
      if (bbuf) free(bbuf);
      if (abuf) free(abuf);
+      ImageClose(image); 
      return NULL;
    }
    ptr = base;
--- a/progs/tests/Makefile
+++ b/progs/tests/Makefile
@@ -25,6 +25,7 @@ SOURCES = \
 	arbvptorus.c \
 	arbvpwarpmesh.c \
 	arraytexture.c \
+	auxbuffer.c \
 	blendminmax.c \
 	blendsquare.c \
 	blendxor.c \
@@ -41,6 +42,7 @@ SOURCES = \
 	cva.c \
 	drawbuffers.c \
 	exactrast.c \
+	ext422square.c \
 	floattex.c \
 	fbotest1.c \
 	fbotest2.c \
@@ -66,6 +68,8 @@ SOURCES = \
 	mipmap_limits.c \
 	mipmap_view.c \
 	multipal.c \
+	multitexarray.c \
+	multiwindow.c \
 	no_s3tc.c \
 	packedpixels.c \
 	pbo.c \
@@ -88,10 +92,12 @@ SOURCES = \
 	subtex \
 	subtexrate.c \
 	tex1d.c \
+	texcmp.c \
 	texcompress2.c \
 	texcompsub.c \
 	texdown \
 	texfilt.c \
+	texgenmix.c \
 	texline.c \
 	texobj.c \
 	texobjshare.c \
@@ -101,6 +107,7 @@ SOURCES = \
 	vao-01.c \
 	vao-02.c \
 	vparray.c \
+	vpeval.c \
 	vptest1.c \
 	vptest2.c \
 	vptest3.c \
--- a/progs/tests/arraytexture.c
+++ b/progs/tests/arraytexture.c
@@ -77,10 +77,6 @@ static GLfloat texZ = 0.0;
 static GLfloat texZ_dir = 0.01;
 static GLint num_layers;

-static PFNGLBINDPROGRAMARBPROC bind_program;
-static PFNGLPROGRAMSTRINGARBPROC program_string;
-static PFNGLGENPROGRAMSARBPROC gen_programs;
-

 static void
 PrintString(const char *s)
@@ -125,13 +121,13 @@ static void Display(void)
   glMatrixMode(GL_MODELVIEW);
   glLoadIdentity();

-   (*bind_program)(GL_FRAGMENT_PROGRAM_ARB, 0);
+   glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0);
   glColor3f(1,1,1);
   glRasterPos3f(-0.9, -0.9, 0.0);
   sprintf(str, "Texture Z coordinate = %4.1f", texZ);
   PrintString(str);

-   (*bind_program)(GL_FRAGMENT_PROGRAM_ARB, 1);
+   glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 1);
   GL_CHECK_ERROR();
   glEnable(GL_TEXTURE_2D_ARRAY_EXT);
   GL_CHECK_ERROR();
@@ -159,7 +155,7 @@ static void Display(void)

   glDisable(GL_TEXTURE_2D_ARRAY_EXT);
   GL_CHECK_ERROR();
-   (*bind_program)(GL_FRAGMENT_PROGRAM_ARB, 0);
+   glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, 0);
   GL_CHECK_ERROR();

   glutSwapBuffers();
@@ -226,8 +222,8 @@ compile_fragment_program(GLuint id, const char *prog)
   int err;

   err = glGetError();
-   (*bind_program)(GL_FRAGMENT_PROGRAM_ARB, id);
-   (*program_string)(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
+   glBindProgramARB(GL_FRAGMENT_PROGRAM_ARB, id);
+   glProgramStringARB(GL_FRAGMENT_PROGRAM_ARB, GL_PROGRAM_FORMAT_ASCII_ARB,
                     strlen(prog), (const GLubyte *) prog);

   glGetIntegerv(GL_PROGRAM_ERROR_POSITION_ARB, &errorPos);
@@ -264,11 +260,6 @@ static void Init(void)
   require_extension("GL_MESA_texture_array");
   require_extension("GL_SGIS_generate_mipmap");

-   bind_program = glutGetProcAddress("glBindProgramARB");
-   program_string = glutGetProcAddress("glProgramStringARB");
-   gen_programs = glutGetProcAddress("glGenProgramsARB");
-
-
   for (num_layers = 0; textures[num_layers] != NULL; num_layers++)
      /* empty */ ;

--- a/progs/tests/copypixrate.c
+++ b/progs/tests/copypixrate.c
@@ -69,7 +69,7 @@ DrawTestImage(void)
 static int
 Rand(int max)
 {
-   return ((int) random()) % max;
+   return ((int) rand()) % max;
 }


--- a/progs/tests/crossbar.c
+++ b/progs/tests/crossbar.c
@@ -145,7 +145,7 @@ static void Init( void )
 {
   const char * const ver_string = (const char * const)
       glGetString( GL_VERSION );
-   float ver = strtof( ver_string, NULL );
+   float ver = strtod( ver_string, NULL );
   GLint tex_units;
   GLint temp[ 256 ];

--- a/progs/tests/invert.c
+++ b/progs/tests/invert.c
@@ -128,7 +128,7 @@ static void Init( void )
 {
   const char * const ver_string = (const char * const)
       glGetString( GL_VERSION );
-   const float ver = strtof( ver_string, NULL );
+   const float ver = strtod( ver_string, NULL );


   printf("GL_RENDERER = %s\n", (char *) glGetString(GL_RENDERER));
--- a/progs/tests/minmag.c
+++ b/progs/tests/minmag.c
@@ -16,7 +16,6 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#include <unistd.h>
 #include <GL/glew.h>
 #include <GL/glut.h>

--- a/progs/tests/prog_parameter.c
+++ b/progs/tests/prog_parameter.c
@@ -116,7 +116,7 @@ static int set_parameter_batch( GLsizei count, GLfloat * param,


   for ( i = 0 ; i < (4 * count) ; i++ ) {
-      param[i] = (GLfloat) random() / (GLfloat) random();
+      param[i] = (GLfloat) rand() / (GLfloat) rand();
   }

   /* Try using the "classic" interface.
@@ -153,7 +153,7 @@ static int set_parameter_batch( GLsizei count, GLfloat * param,


   for ( i = 0 ; i < (4 * count) ; i++ ) {
-      param[i] = (GLfloat) random() / (GLfloat) random();
+      param[i] = (GLfloat) rand() / (GLfloat) rand();
   }

   printf("Testing glProgram%sParameters4fvEXT (count = %u)...\n", name, count);
@@ -203,20 +203,20 @@ static void Init( void )
   }


-   program_local_parameter4fv = glutGetProcAddress( "glProgramLocalParameter4fvARB" );
-   program_env_parameter4fv = glutGetProcAddress( "glProgramEnvParameter4fvARB" );
+   program_local_parameter4fv = (PFNGLPROGRAMLOCALPARAMETER4FVARBPROC) glutGetProcAddress( "glProgramLocalParameter4fvARB" );
+   program_env_parameter4fv = (PFNGLPROGRAMENVPARAMETER4FVARBPROC) glutGetProcAddress( "glProgramEnvParameter4fvARB" );

-   get_program_local_parameterfv = glutGetProcAddress( "glGetProgramLocalParameterfvARB" );
-   get_program_env_parameterfv = glutGetProcAddress( "glGetProgramEnvParameterfvARB" );
+   get_program_local_parameterfv = (PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC) glutGetProcAddress( "glGetProgramLocalParameterfvARB" );
+   get_program_env_parameterfv = (PFNGLGETPROGRAMENVPARAMETERFVARBPROC) glutGetProcAddress( "glGetProgramEnvParameterfvARB" );

-   bind_program = glutGetProcAddress( "glBindProgramARB" );
-   get_program = glutGetProcAddress( "glGetProgramivARB" );
+   bind_program = (PFNGLBINDPROGRAMARBPROC) glutGetProcAddress( "glBindProgramARB" );
+   get_program = (PFNGLGETPROGRAMIVARBPROC) glutGetProcAddress( "glGetProgramivARB" );

   if ( glutExtensionSupported("GL_EXT_gpu_program_parameters") ) {
      printf("GL_EXT_gpu_program_parameters available, testing that path.\n");

-      program_local_parameters4fv = glutGetProcAddress( "glProgramLocalParameters4fvEXT" );
-      program_env_parameters4fv = glutGetProcAddress( "glProgramEnvParameters4fvEXT" );
+      program_local_parameters4fv = (PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC) glutGetProcAddress( "glProgramLocalParameters4fvEXT" );
+      program_env_parameters4fv = (PFNGLPROGRAMENVPARAMETERS4FVEXTPROC) glutGetProcAddress( "glProgramEnvParameters4fvEXT" );
   }
   else {
      printf("GL_EXT_gpu_program_parameters not available.\n");
--- a/progs/tests/stencil_twoside.c
+++ b/progs/tests/stencil_twoside.c
@@ -274,9 +274,9 @@ static void Init( void )
   if (atof( ver_string ) < 2.0) {
      use20syntax = 0;
   }
-   stencil_func_separate = glutGetProcAddress( "glStencilFuncSeparate" );
-   stencil_func_separate_ati = glutGetProcAddress( "glStencilFuncSeparateATI" );
-   stencil_op_separate = glutGetProcAddress( "glStencilOpSeparate" );
+   stencil_func_separate = (PFNGLSTENCILFUNCSEPARATEPROC) glutGetProcAddress( "glStencilFuncSeparate" );
+   stencil_func_separate_ati = (PFNGLSTENCILFUNCSEPARATEATIPROC) glutGetProcAddress( "glStencilFuncSeparateATI" );
+   stencil_op_separate = (PFNGLSTENCILOPSEPARATEPROC) glutGetProcAddress( "glStencilOpSeparate" );

   printf("\nAll 5 squares should be the same color.\n");
 }
--- a/progs/tests/texdown.c
+++ b/progs/tests/texdown.c
@@ -162,7 +162,7 @@ MeasureDownloadRate(void)
   const int image_bytes = align(w * h * BytesPerTexel(Format), ALIGN);
   const int bytes = image_bytes * NR_TEXOBJ;
   GLubyte *orig_texImage, *orig_getImage;
-   GLubyte *texImage, *getImage;
+   GLubyte *texImage;
   GLdouble t0, t1, time;
   int count;
   int i;
@@ -176,13 +176,14 @@ MeasureDownloadRate(void)
   orig_getImage = (GLubyte *) malloc(image_bytes + ALIGN);
   if (!orig_texImage || !orig_getImage) {
      DownloadRate = 0.0;
+      free(orig_texImage);
+      free(orig_getImage);
      return;
   }

   printf("alloc %p %p\n", orig_texImage, orig_getImage);

   texImage = (GLubyte *)align((unsigned long)orig_texImage, ALIGN);
-   getImage = (GLubyte *)align((unsigned long)orig_getImage, ALIGN);   

   for (i = 1; !(((unsigned long)texImage) & i); i<<=1)
      ;
--- a/progs/tests/vao-01.c
+++ b/progs/tests/vao-01.c
@@ -124,10 +124,10 @@ static void Init( void )
      exit(2);
   }

-   bind_vertex_array = glutGetProcAddress( "glBindVertexArrayAPPLE" );
-   gen_vertex_arrays = glutGetProcAddress( "glGenVertexArraysAPPLE" );
-   delete_vertex_arrays = glutGetProcAddress( "glDeleteVertexArraysAPPLE" );
-   is_vertex_array = glutGetProcAddress( "glIsVertexArrayAPPLE" );
+   bind_vertex_array = (PFNGLBINDVERTEXARRAYAPPLEPROC) glutGetProcAddress( "glBindVertexArrayAPPLE" );
+   gen_vertex_arrays = (PFNGLGENVERTEXARRAYSAPPLEPROC) glutGetProcAddress( "glGenVertexArraysAPPLE" );
+   delete_vertex_arrays = (PFNGLDELETEVERTEXARRAYSAPPLEPROC) glutGetProcAddress( "glDeleteVertexArraysAPPLE" );
+   is_vertex_array = (PFNGLISVERTEXARRAYAPPLEPROC) glutGetProcAddress( "glIsVertexArrayAPPLE" );


   (*gen_vertex_arrays)( 1, & obj );
--- a/progs/tests/vao-02.c
+++ b/progs/tests/vao-02.c
@@ -125,10 +125,10 @@ static void Init( void )
      exit(2);
   }

-   bind_vertex_array = glutGetProcAddress( "glBindVertexArrayAPPLE" );
-   gen_vertex_arrays = glutGetProcAddress( "glGenVertexArraysAPPLE" );
-   delete_vertex_arrays = glutGetProcAddress( "glDeleteVertexArraysAPPLE" );
-   is_vertex_array = glutGetProcAddress( "glIsVertexArrayAPPLE" );
+   bind_vertex_array = (PFNGLBINDVERTEXARRAYAPPLEPROC) glutGetProcAddress( "glBindVertexArrayAPPLE" );
+   gen_vertex_arrays = (PFNGLGENVERTEXARRAYSAPPLEPROC) glutGetProcAddress( "glGenVertexArraysAPPLE" );
+   delete_vertex_arrays = (PFNGLDELETEVERTEXARRAYSAPPLEPROC) glutGetProcAddress( "glDeleteVertexArraysAPPLE" );
+   is_vertex_array = (PFNGLISVERTEXARRAYAPPLEPROC) glutGetProcAddress( "glIsVertexArrayAPPLE" );


   (*gen_vertex_arrays)( 1, & obj );
--- a/progs/trivial/clear-fbo-tex.c
+++ b/progs/trivial/clear-fbo-tex.c
@@ -88,7 +88,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/clear-fbo.c
+++ b/progs/trivial/clear-fbo.c
@@ -73,7 +73,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/clear-random.c
+++ b/progs/trivial/clear-random.c
@@ -61,7 +61,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(0);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/clear-scissor.c
+++ b/progs/trivial/clear-scissor.c
@@ -38,7 +38,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }
    glutPostRedisplay();
 }
--- a/progs/trivial/clear.c
+++ b/progs/trivial/clear.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(0);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/createwin.c
+++ b/progs/trivial/createwin.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-begin-call-end.c
+++ b/progs/trivial/dlist-begin-call-end.c
@@ -87,7 +87,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-dangling.c
+++ b/progs/trivial/dlist-dangling.c
@@ -74,7 +74,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-edgeflag-dangling.c
+++ b/progs/trivial/dlist-edgeflag-dangling.c
@@ -76,7 +76,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-edgeflag.c
+++ b/progs/trivial/dlist-edgeflag.c
@@ -81,7 +81,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-flat-tri.c
+++ b/progs/trivial/dlist-flat-tri.c
@@ -93,7 +93,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-mat-tri.c
+++ b/progs/trivial/dlist-mat-tri.c
@@ -103,7 +103,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-recursive-call.c
+++ b/progs/trivial/dlist-recursive-call.c
@@ -118,7 +118,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-tri-flat-tri.c
+++ b/progs/trivial/dlist-tri-flat-tri.c
@@ -99,7 +99,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/dlist-tri-mat-tri.c
+++ b/progs/trivial/dlist-tri-mat-tri.c
@@ -102,7 +102,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-clip.c
+++ b/progs/trivial/line-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-cull.c
+++ b/progs/trivial/line-cull.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-flat.c
+++ b/progs/trivial/line-flat.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-stipple-wide.c
+++ b/progs/trivial/line-stipple-wide.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-userclip-clip.c
+++ b/progs/trivial/line-userclip-clip.c
@@ -66,7 +66,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-userclip-nop-clip.c
+++ b/progs/trivial/line-userclip-nop-clip.c
@@ -66,7 +66,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-userclip-nop.c
+++ b/progs/trivial/line-userclip-nop.c
@@ -66,7 +66,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-userclip.c
+++ b/progs/trivial/line-userclip.c
@@ -66,7 +66,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line-wide.c
+++ b/progs/trivial/line-wide.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/line.c
+++ b/progs/trivial/line.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/lineloop-clip.c
+++ b/progs/trivial/lineloop-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/lineloop.c
+++ b/progs/trivial/lineloop.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/linestrip-clip.c
+++ b/progs/trivial/linestrip-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/linestrip-flat-stipple.c
+++ b/progs/trivial/linestrip-flat-stipple.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/linestrip-stipple-wide.c
+++ b/progs/trivial/linestrip-stipple-wide.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/linestrip-stipple.c
+++ b/progs/trivial/linestrip-stipple.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/linestrip.c
+++ b/progs/trivial/linestrip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/point-clip.c
+++ b/progs/trivial/point-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/point-param.c
+++ b/progs/trivial/point-param.c
@@ -59,7 +59,7 @@ static void Key(unsigned char key, int x, int y)
    case 27:
 	exit(1);
    default:
-	return;
+	break;
    }
    glutPostRedisplay();
 }
--- a/progs/trivial/point-sprite.c
+++ b/progs/trivial/point-sprite.c
@@ -96,7 +96,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/point-wide-smooth.c
+++ b/progs/trivial/point-wide-smooth.c
@@ -63,7 +63,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/point-wide.c
+++ b/progs/trivial/point-wide.c
@@ -63,7 +63,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/point.c
+++ b/progs/trivial/point.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/poly-flat-clip.c
+++ b/progs/trivial/poly-flat-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/poly-flat-unfilled-clip.c
+++ b/progs/trivial/poly-flat-unfilled-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/poly-flat.c
+++ b/progs/trivial/poly-flat.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/poly-unfilled.c
+++ b/progs/trivial/poly-unfilled.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/poly.c
+++ b/progs/trivial/poly.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-clip-all-vertices.c
+++ b/progs/trivial/quad-clip-all-vertices.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-clip.c
+++ b/progs/trivial/quad-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-degenerate.c
+++ b/progs/trivial/quad-degenerate.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-flat.c
+++ b/progs/trivial/quad-flat.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-offset-factor.c
+++ b/progs/trivial/quad-offset-factor.c
@@ -55,7 +55,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-offset-unfilled.c
+++ b/progs/trivial/quad-offset-unfilled.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-offset-units.c
+++ b/progs/trivial/quad-offset-units.c
@@ -55,7 +55,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-tex-alpha.c
+++ b/progs/trivial/quad-tex-alpha.c
@@ -88,7 +88,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-tex-pbo.c
+++ b/progs/trivial/quad-tex-pbo.c
@@ -105,7 +105,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-unfilled-clip.c
+++ b/progs/trivial/quad-unfilled-clip.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-unfilled-stipple.c
+++ b/progs/trivial/quad-unfilled-stipple.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad-unfilled.c
+++ b/progs/trivial/quad-unfilled.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quad.c
+++ b/progs/trivial/quad.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quads.c
+++ b/progs/trivial/quads.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quadstrip-cont.c
+++ b/progs/trivial/quadstrip-cont.c
@@ -57,7 +57,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/progs/trivial/quadstrip-flat.c
+++ b/progs/trivial/quadstrip-flat.c
@@ -62,7 +62,7 @@ static void Key(unsigned char key, int x, int y)
      case 27:
 	exit(1);
      default:
-	return;
+	break;
    }

    glutPostRedisplay();
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ian Romanick	9dbd47fc6b	mesa: set version string to 7.6.1-rc3	2009-12-07 16:59:59 -08:00
Vinson Lee	7d84169865	progs/demos: Fix memory leak in projtex.c.	2009-12-07 12:31:08 -08:00
Vinson Lee	7005f7cd1a	st/egl: Fix memory leak in egl_tracker.c. (cherry picked from commit `052b127842`)	2009-12-06 01:15:24 -08:00
Vinson Lee	c994f08eb1	dri: Fix potential null pointer dereference in driBindContext. (cherry picked from commit `919898e92f`)	2009-12-06 01:01:55 -08:00
Vinson Lee	f622b649fb	dri: Fix potential null pointer deference in dri_put_drawable. (cherry picked from commit `364070b1f2`)	2009-12-06 01:00:20 -08:00
Vinson Lee	76b3523d75	glx: Prevent potential null pointer deference in driCreateContext. (cherry picked from commit `4b0b250aae`)	2009-12-06 00:56:20 -08:00
Vinson Lee	978b80c8e3	progs/tests: Add tests to Makefile. (cherry picked from commit `76d2ec3a0a`)	2009-12-05 21:20:54 -08:00
Vinson Lee	3cd745515e	draw: Initialize variable in draw_pt.c. (cherry picked from commit `ea98e9820d`)	2009-12-05 15:11:41 -08:00
Vinson Lee	b2953ee1a6	mesa: Fix array out-of-bounds access by _mesa_TexGenf. _mesa_TexGenf calls _mesa_TexGenfv, which uses the params argument as an array. (cherry picked from commit `ca5a7aadb4`)	2009-12-05 13:00:35 -08:00
Vinson Lee	d74cd04e61	mesa: Fix array out-of-bounds access by _mesa_TexGeni. _mesa_TexGeni calls _mesa_TexGeniv, which uses the params argument as an array. (cherry picked from commit `d55fb7c835`)	2009-12-05 12:59:34 -08:00
Vinson Lee	ca8a2150c7	mesa: Fix array out-of-bounds access by _mesa_TexParameterf. _mesa_TexParameterf calls set_tex_parameterf, which uses the params argument as an array. (cherry picked from commit `270d36da14`)	2009-12-05 12:50:56 -08:00
Vinson Lee	4071d065c2	mesa: Fix array out-of-bounds access by _mesa_TexParameterf. _mesa_TexParameterf calls set_tex_parameteri, which uses the params argument as an array. (cherry picked from commit `a201dfb6bf`)	2009-12-05 12:47:40 -08:00
Vinson Lee	1446f30875	progs/samples: Fix memory leak if malloc fails in rgbtoppm.c.	2009-12-05 01:43:29 -08:00
Vinson Lee	412aeeed1c	progs/samples: Fix memory leak if fopen fails in rgbtoppm.c.	2009-12-05 01:38:14 -08:00
Vinson Lee	6212c8103a	progs/samples: Add rgbtoppm to Makefile.	2009-12-05 01:28:47 -08:00
Vinson Lee	2cd2341ce8	progs/tests: Removed unused variable from texdown.c.	2009-12-05 01:23:05 -08:00
Vinson Lee	d642edd2d1	progs/vpglsl: Assign glGetUniformLocationARB return value to GLint. The return type of glGetUniformLocationARB is GLint, not GLuint.	2009-12-05 01:11:26 -08:00
Vinson Lee	8d2f3434c5	progs/fp: Redraw upon keypress.	2009-12-04 23:31:39 -08:00
Vinson Lee	fe8e18bcd4	mesa: Fix array out-of-bounds access in _mesa_TexEnvf. _mesa_TexEnvf calls _mesa_TexEnvfv, which uses the param argument as an array. (cherry picked from commit `a11d60d14c`)	2009-12-04 17:48:30 -08:00
Vinson Lee	4fb5ae7233	progs/util: Fix memory leak if fread returns 0 in CompileShaderFile. (cherry picked from commit `11905da883`)	2009-12-04 17:35:00 -08:00
Vinson Lee	5683d7d43f	progs/util: Fix memory leak if fail to load/compile shader Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit `c475079ef2`)	2009-12-04 17:32:48 -08:00
Vinson Lee	e5bc2a19bd	progs/fp: Add tri-inv.c to Makefile.	2009-12-04 17:29:53 -08:00
Coleman Kane	225bc70b77	r300g: use $(MAKE) variable Fixes bug 24501	2009-12-04 08:45:04 -07:00
Brian Paul	ca7cd3ade0	progs/xdemos: fix some visual/fbconfig logic in glxinfo.c The fbAttribSingle/Double arrays had wrong GLX_DOUBLEBUFFER values. We only need to use the glXChooseFBConfig() code when glXChooseVisual() fails (but I don't know when that would happen). Other recent commits errantly removed some code in this area too.	2009-12-04 08:09:57 -07:00
Brian Paul	fb83fa26c4	docs: a few more fixes for 7.6.1	2009-12-04 08:09:07 -07:00
Alex Deucher	8d8fd9776e	radeon: fix polygon stipple fixes fdo bug 25354 Signed-off-by: Alex Deucher <alexdeucher@gmail.com>	2009-12-04 09:52:37 -05:00
Vinson Lee	c74afe0c46	glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore. (cherry picked from commit `808f037660`)	2009-12-04 00:14:31 -08:00
Vinson Lee	8df551c46b	glu/sgi: Fix memory leak in gluBuild1DMipmapLevelsCore. (cherry picked from commit `94bcb9f1a4`)	2009-12-04 00:14:05 -08:00
Vinson Lee	ea487c6d0b	glu/sgi: Fix memory leak in gluBuild2DMipmapLevelsCore. (cherry picked from commit `0d89f3dc7f`)	2009-12-04 00:13:25 -08:00
Vinson Lee	7b5eba453e	glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore. (cherry picked from commit `f895abbd97`)	2009-12-04 00:12:49 -08:00
Vinson Lee	7ed749c062	glu/sgi: Fix memory leak in gluBuild3DMipmapLevelsCore. (cherry picked from commit `326b66d724`)	2009-12-04 00:11:58 -08:00
Vinson Lee	80a3944a4d	glu/sgi: Fix memory leak in bitmapBuild2DMipmaps. (cherry picked from commit `5b925b7daa`)	2009-12-04 00:11:02 -08:00
Vinson Lee	6c1fc2b2a5	glu/sgi: Fix memory leak in gluScaleImage3D. (cherry picked from commit `b611f639b4`)	2009-12-04 00:10:22 -08:00
Vinson Lee	fe38c16021	glu/sgi: Fix memory leak in gluScaleImage. (cherry picked from commit `a9c540f5de`)	2009-12-04 00:09:22 -08:00
Vinson Lee	d23bb22f62	glu: Fix memory leak in __gl_meshMakeEdge. (cherry picked from commit `d3b4c99c70`)	2009-12-04 00:07:51 -08:00
Vinson Lee	12a440abfb	progs/xdemos: Silence unused value warnings in sharedtex_mt.c. (cherry picked from commit `8556fad751`)	2009-12-04 00:04:38 -08:00
Vinson Lee	4bf96ebdae	progs/xdemos: Fix memory leak in pbdemo.c. (cherry picked from commit `e0857962b9`)	2009-12-04 00:03:14 -08:00
Vinson Lee	ba3fedf246	progs/xdemos: Add missing break statement in offset.c. (cherry picked from commit `4ab8dbe593`)	2009-12-04 00:01:20 -08:00
Vinson Lee	8350648401	progs/xdemos: Remove duplicate code in glxinfo.c. (cherry picked from commit `a4720a1a32`)	2009-12-03 23:59:47 -08:00
Vinson Lee	7324c22024	progs/xdemos: Fix memory leak in glxinfo.c. (cherry picked from commit `f080567f4c`)	2009-12-03 23:59:11 -08:00
Vinson Lee	68d206fafa	progs/xdemos: Add assert in corender.c. (cherry picked from commit `66a4ec14c3`)	2009-12-03 23:22:47 -08:00
Vinson Lee	69ed1147a8	progs/vp: Fix memory leak in vp-tris.c. (cherry picked from commit `760cf71572`)	2009-12-03 23:20:18 -08:00
Vinson Lee	efb582fde7	progs/tests: Fix memory leak in texdown.c if malloc fails. (cherry picked from commit `e3cfd78969`)	2009-12-03 23:17:26 -08:00
Vinson Lee	b210739aad	progs/redbook: Fix memory leak in quadric.c. (cherry picked from commit `47b5f584a6`)	2009-12-03 23:12:59 -08:00
Vinson Lee	b1a87a3e0b	progs/glsl: Fix memory leak in deriv.c. (cherry picked from commit `0e783c7d03`)	2009-12-03 22:54:35 -08:00
Vinson Lee	25fd168f03	progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c. tangentAtrrib is assigned the result of glGetAttribLocation. The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if tangentAttrib is a GLuint. (cherry picked from commit `b8dcb79c53`)	2009-12-03 22:51:43 -08:00
Vinson Lee	b803abbaad	progs/demos: Fix memory leak in ray.c. (cherry picked from commit `6b480dc21d`)	2009-12-03 22:49:18 -08:00
Vinson Lee	5820dae4ec	progs/demos: Fix memory leak in projtex.c. (cherry picked from commit `ee555e3d69`)	2009-12-03 22:44:55 -08:00
Vinson Lee	fc5f07de1a	progs/demos: Fix memory leak in ipers.c. (cherry picked from commit `a1afe303de`)	2009-12-03 22:38:44 -08:00
Vinson Lee	d245a951f3	progs/demos: Fix memory leak in fslight.c. (cherry picked from commit `aef3218f0b`)	2009-12-03 22:36:37 -08:00
Vinson Lee	905e12f3cc	gallium/util: Initialize variables in u_pack_color.h. (cherry picked from commit `36e2074b63`)	2009-12-03 17:55:59 -08:00
Vinson Lee	56de7e222e	progs/trivial: Redraw upon keypress. (cherry picked from commit `9553a42f63`)	2009-12-03 17:27:24 -08:00
Vinson Lee	34a0b22a74	progs/trivial: Redraw upon keypress. (cherry picked from commit `3790c6a13b`)	2009-12-03 17:25:00 -08:00
Vinson Lee	9e29242331	progs/glsl: Redraw upon keypress. (cherry picked from commit `881f55236a`)	2009-12-03 17:17:24 -08:00
Vinson Lee	a0ac8fc7d8	progs/util: Exit RawImageGetData early if malloc fails. Prevents a null pointer deference later on. (cherry picked from commit `e26135a744`)	2009-12-03 17:14:08 -08:00
Vinson Lee	0a6acecb35	progs/util: Fix memory leak if malloc fails in RawImageOpen. (cherry picked from commit `d36cb2396c`)	2009-12-03 17:08:48 -08:00
Vinson Lee	305d4f147e	progs/util: Fix memory leak if fopen fails in RawImageOpen. (cherry picked from commit `d9508e8df9`)	2009-12-03 17:03:26 -08:00
Vinson Lee	772e004781	progs/util: Fix memory leak if malloc fails in tkRGBImageLoad. (cherry picked from commit `786d539511`)	2009-12-03 16:57:17 -08:00
Vinson Lee	f1172c4030	progs/util: Fix memory leak if LoadRGBImage fails. (cherry picked from commit `041cd0e110`)	2009-12-03 16:24:03 -08:00
Vinson Lee	84de1672d3	progs/util: Fix memory if LoadRGBMipmaps2 fails. (cherry picked from commit `28b8e4bcd7`)	2009-12-03 16:15:22 -08:00
Vinson Lee	4ca8e1680e	progs/util: Fix memory leak if LoadYUVImage fails. (cherry picked from commit `0e790ac353`)	2009-12-03 16:03:22 -08:00
Vinson Lee	d6a993135f	progs/fp: Redraw upon keypress. (cherry picked from commit `cde6643724`)	2009-12-03 15:59:56 -08:00
Vinson Lee	005242f166	prog/tests: Fix MSVC build. Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit `9c3197ef0a`)	2009-12-03 15:53:13 -08:00
Vinson Lee	d3208678c2	progs/tests: fix MSVC build. Signed-off-by: Brian Paul <brianp@vmware.com> (cherry picked from commit `a8ed066858`)	2009-12-03 15:50:36 -08:00
Vinson Lee	97cbf4943a	progs/tests: Fix MSVC build. (cherry picked from commit `50e113e375`)	2009-12-03 15:45:18 -08:00
Vinson Lee	a99bf51bc8	progs/tests: Fix MSVC build. (cherry picked from commit `952bf63e2c`)	2009-12-03 15:35:10 -08:00
José Fonseca	28474e1225	progs/tests: Use rand() instead of random(). Forgot these on previous commit. (cherry picked from commit `166957abeb`)	2009-12-03 15:34:38 -08:00
José Fonseca	bb6e3af939	progs/tests: Use rand() instead of random(). More portable. Same implementation on Linux. (cherry picked from commit `699260b195`)	2009-12-03 15:32:45 -08:00
Vinson Lee	a38776419b	progs/tests: Fix MSVC build. (cherry picked from commit `f7455ad7af`)	2009-12-03 15:29:01 -08:00
Vinson Lee	791b754687	prog/tests: Fix MSVC build. (cherry picked from commit `60b6c74583`)	2009-12-03 15:24:43 -08:00
Vinson Lee	89e747920f	prog/tests: Fix MSVC build. (cherry picked from commit `96fd13c1a0`)	2009-12-03 15:15:12 -08:00
Vinson Lee	5a25adb646	progs/tests: fix MSVC build. (cherry picked from commit `9c778a90ea`)	2009-12-03 15:11:25 -08:00
Vinson Lee	3910e88ebf	prog/tests: Fix MSVC build. (cherry picked from commit `ea862ec8ff`)	2009-12-03 15:05:44 -08:00
Alex Deucher	2b5618fc5b	r200: fix polygon stipple fixes fdo bug 25354 Signed-off-by: Alex Deucher <alexdeucher@gmail.com>	2009-12-03 11:20:40 -05:00
Vinson Lee	c3b7f93e02	scons: Add Mac OS to target platform list. (cherry picked from commit `2c307c7750`)	2009-12-02 20:33:32 -08:00
Vinson Lee	235c0c8134	progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS. (cherry picked from commit `b98db7bf69`)	2009-12-02 20:28:54 -08:00
Vinson Lee	0a107d36c2	progs/glsl: Fix trirast GLSL compilation errors on Mac OS. (cherry picked from commit `4b3ec2acf2`)	2009-12-02 20:20:12 -08:00
Vinson Lee	b094683e7c	progs/glsl: Fix noise GLSL compilation error on Mac OS. (cherry picked from commit `0d31990b47`)	2009-12-02 20:16:51 -08:00
Vinson Lee	592c8522a2	demos/glsl: Add missing break statement to noise test. (cherry picked from commit `7dfea5c072`)	2009-12-02 20:16:41 -08:00
Vinson Lee	8f4d3613da	progs/glsl: Fix multinoise GLSL compilation errors on Mac OS. (cherry picked from commit `d4dc2e30da`)	2009-12-02 20:06:20 -08:00
Vinson Lee	9ed77d12b1	progs/glsl: Add missing break statement in multinoise.c. (cherry picked from commit `43080e40aa`)	2009-12-02 20:06:11 -08:00
Vinson Lee	832593772d	progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS. (cherry picked from commit `04442841fb`)	2009-12-02 19:55:48 -08:00
Vinson Lee	2a5cd95e24	progs/glsl: Include local headers before installed headers during compilation. Fixes compilation errors on platforms with insufficient older installed GL headers. (cherry picked from commit `d17af7d1e1`)	2009-12-02 19:39:25 -08:00
Brian Paul	ccea09cd3a	progs/glsl: minor Makefile clean-ups (cherry picked from commit `4df2f7af5e`)	2009-12-02 19:39:11 -08:00
Vinson Lee	67a0628ab2	progs: Ignore Mac OS dSYM directories. (cherry picked from commit `a420056750`)	2009-12-02 15:22:34 -08:00
Brian Paul	908a3e56cc	cell: added tex_usage param to xm_surface_buffer_create()	2009-12-02 09:31:26 -07:00
Brian Paul	ba97b98842	progs/demos: remove unused glFogCoordPointer_ext var	2009-12-01 12:23:07 -07:00
Tom Fogal	b9f4a0bd2b	Simplify hackery added to fix AIX build. Borrow an idiom from the GNU build system which can handle `for' loops over empty lists.	2009-12-01 10:27:27 -08:00
Ian Romanick	d8da270a2b	intel: Remove GL_NV_point_sprite from extension list i830 does not (and cannot!) support the any of the non-default GL_POINT_SPRITE_R_MODE_NV settings. i915 and i965 could, but currently do not. In both cases it would require mucking about with the fragment shader.	2009-12-01 10:25:44 -08:00
Ian Romanick	910aaed4da	mesa: set version string to 7.6.1-rc2	2009-11-30 17:55:21 -08:00