[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46811] branches/soc-2012-swiss_cheese/ intern/ghost/intern/GHOST_WindowX11.cpp: removed "fake" glx tokens from GHOST_WindowX11.cpp

Jason Wilkins Jason.A.Wilkins at gmail.com
Sun May 20 18:47:11 CEST 2012


Revision: 46811
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46811
Author:   jwilkins
Date:     2012-05-20 16:47:11 +0000 (Sun, 20 May 2012)
Log Message:
-----------
removed "fake" glx tokens from GHOST_WindowX11.cpp

Modified Paths:
--------------
    branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.cpp

Modified: branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.cpp
===================================================================
--- branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.cpp	2012-05-20 15:57:39 UTC (rev 46810)
+++ branches/soc-2012-swiss_cheese/intern/ghost/intern/GHOST_WindowX11.cpp	2012-05-20 16:47:11 UTC (rev 46811)
@@ -184,16 +184,16 @@
 	int attributes[40], i, samples;
 	Atom atoms[2];
 	int natom;
-	int glxVersionMajor, glxVersionMinor; // As in GLX major.minor
+	int major, minor; // As in GLX major.minor
 
 #ifdef WITH_X11_XINPUT
 	/* initialize incase X11 fails to load */
 	memset(&m_xtablet, 0, sizeof(m_xtablet));
 #endif
 
-	m_visual = NULL;
+	m_visual= NULL;
 
-	if (!glXQueryVersion(m_display, &glxVersionMajor, &glxVersionMinor)) {
+	if (!glXQueryVersion(m_display, &major, &minor)) {
 		printf("%s:%d: X11 glXQueryVersion() failed, verify working openGL system!\n", __FILE__, __LINE__);
 		
 		/* exit if this is the first window */
@@ -219,7 +219,7 @@
 		attributes[i++] = GLX_GREEN_SIZE; attributes[i++] = 1;
 		attributes[i++] = GLX_DEPTH_SIZE; attributes[i++] = 1;
 		/* GLX >= 1.4 required for multi-sample */
-		if (samples && (glxVersionMajor >= 1) && (glxVersionMinor >= 4)) {
+		if(samples && (major >= 1) && (minor >= 4)) {
 			attributes[i++] = GLX_SAMPLE_BUFFERS; attributes[i++] = 1;
 			attributes[i++] = GLX_SAMPLES; attributes[i++] = samples;
 		}




More information about the Bf-blender-cvs mailing list