Merge git://proxy01.pd.intel.com:9419/git/mesa/mesa into crestline

2 files changed, 7 insertions, 2 deletions

diff --git a/progs/tests/fbotest1.c b/progs/tests/fbotest1.c
index ed72ab16dd..8f4569ff3b 100644
--- a/progs/tests/fbotest1.c
+++ b/progs/tests/fbotest1.c
@@ -13,6 +13,7 @@
 #include <math.h>
 #include <GL/glut.h>
 
+static int Win;
 static int Width = 400, Height = 400;
 static GLuint MyFB, MyRB;
 
@@ -99,6 +100,7 @@ CleanUp(void)
    glDeleteRenderbuffersEXT(1, &MyRB);
    assert(!glIsFramebufferEXT(MyFB));
    assert(!glIsRenderbufferEXT(MyRB));
+   glutDestroyWindow(Win);
    exit(0);
 }
 
@@ -194,7 +196,7 @@ main( int argc, char *argv[] )
    glutInitWindowPosition( 0, 0 );
    glutInitWindowSize(Width, Height);
    glutInitDisplayMode( GLUT_RGB | GLUT_DOUBLE );
-   glutCreateWindow(argv[0]);
+   Win = glutCreateWindow(argv[0]);
    glutReshapeFunc( Reshape );
    glutKeyboardFunc( Key );
    glutDisplayFunc( Display );
diff --git a/progs/tests/fbotexture.c b/progs/tests/fbotexture.c
index 13a29db3f3..aa9f617122 100644
--- a/progs/tests/fbotexture.c
+++ b/progs/tests/fbotexture.c
@@ -23,6 +23,7 @@
 #define DRAW 1
 
 
+static int Win = 0;
 static int Width = 400, Height = 400;
 
 static GLenum TexTarget = GL_TEXTURE_2D; /*GL_TEXTURE_RECTANGLE_ARB;*/
@@ -232,6 +233,8 @@ CleanUp(void)
 
    glDeleteTextures(1, &TexObj);
 
+   glutDestroyWindow(Win);
+
    exit(0);
 }
 
@@ -392,7 +395,7 @@ main(int argc, char *argv[])
    glutInitWindowPosition(0, 0);
    glutInitWindowSize(Width, Height);
    glutInitDisplayMode(GLUT_RGB | GLUT_DOUBLE);
-   glutCreateWindow(argv[0]);
+   Win = glutCreateWindow(argv[0]);
    glutReshapeFunc(Reshape);
    glutKeyboardFunc(Key);
    glutDisplayFunc(Display);