OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-04-16 10:08:36 +03:00
Code

0022353: Problem in OpenGl viewer with MESA drivers

Browse Source
This commit is contained in:
APL and KGV 2011-09-16 12:37:51 +00:00 committed by bugmaster
parent cdc2203b32
commit 18758aca3d
1 changed files with 64 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
src/OpenGl/OpenGl_txgl.cxx
View File

@ -177,70 +177,83 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
#ifndef WNT #ifndef WNT
GLCONTEXT ctx; GLCONTEXT ctx;
static int sdesc[11];
Colormap cmap; Colormap cmap;
XVisualInfo* vis=NULL; XVisualInfo* vis=NULL;
/* XVisualInfo tmplt;*/ /* XVisualInfo tmplt;*/
XSetWindowAttributes cwa; XSetWindowAttributes cwa;
XColor color; XColor color;
/* Tint i, n, nret;*/
Tint n;
Tint scr;
int value; int value;
char string[CALL_DEF_STRING_LENGTH]; char string[CALL_DEF_STRING_LENGTH];
int DBuffer = True;
XWindowAttributes wattr;
WINDOW win; WINDOW win;
unsigned long mask = 0; int DBuffer = (call_util_osd_getenv ("CALL_OPENGL_NO_DBF", string, CALL_DEF_STRING_LENGTH)) ? False : True;
/* unsigned long background_pixel = 0;*/
if (call_util_osd_getenv("CALL_OPENGL_NO_DBF", string, CALL_DEF_STRING_LENGTH))
DBuffer = False;
if (call_util_osd_getenv("JWR_PIXMAP_DB", string, CALL_DEF_STRING_LENGTH)) if (call_util_osd_getenv("JWR_PIXMAP_DB", string, CALL_DEF_STRING_LENGTH))
TelSetPixmapDB(1); TelSetPixmapDB(1);
XGetWindowAttributes( disp , par , &wattr ); XWindowAttributes wattr;
XGetWindowAttributes (disp, par, &wattr);
n = 0; Tint scr = DefaultScreen (disp);
sdesc[n] = GLX_RGBA;n++;
sdesc[n] = GLX_DEPTH_SIZE;n++;
sdesc[n] = 1;n++;
sdesc[n] = GLX_RED_SIZE;n++;
sdesc[n] = (wattr.depth <= 8) ? 0 : 1;n++;
sdesc[n] = GLX_GREEN_SIZE;n++;
sdesc[n] = (wattr.depth <= 8) ? 0 : 1;n++;
sdesc[n] = GLX_BLUE_SIZE;n++;
sdesc[n] = (wattr.depth <= 8) ? 0 : 1;n++;
if (DBuffer) {
sdesc[n] = GLX_DOUBLEBUFFER;n++;
}
sdesc[n] = None;n++;
scr = DefaultScreen( disp );
#if defined(__linux) || defined(Linux) #if defined(__linux) || defined(Linux)
{ {
XVisualInfo vinfo; XVisualInfo aVisInfo;
int ninfo; int aNbItems;
unsigned long vmask = VisualIDMask | VisualScreenMask; int isGl, isDoubleBuffer, isRGBA, aDepthSize;
vinfo.visualid = wattr.visual->visualid; unsigned long aVisInfoMask = VisualIDMask | VisualScreenMask;
vinfo.screen = DefaultScreen( disp ); aVisInfo.visualid = wattr.visual->visualid;
vis = XGetVisualInfo( disp, vmask, &vinfo, &ninfo); aVisInfo.screen = DefaultScreen (disp);
vis = XGetVisualInfo (disp, aVisInfoMask, &aVisInfo, &aNbItems);
if (vis != NULL)
{
// check Visual for OpenGl context's parameters compability
if (glXGetConfig (disp, vis, GLX_USE_GL, &isGl) != 0)
isGl = 0;
if (glXGetConfig (disp, vis, GLX_RGBA, &isRGBA) != 0)
isRGBA = 0;
if (glXGetConfig (disp, vis, GLX_DOUBLEBUFFER, &isDoubleBuffer) != 0)
isDoubleBuffer = 0;
if (glXGetConfig (disp, vis, GLX_DEPTH_SIZE, &aDepthSize) != 0)
aDepthSize = 0;
if (!isGl || !aDepthSize || !isRGBA || isDoubleBuffer != DBuffer)
{
XFree (vis);
vis = NULL;
}
}
} }
#endif #endif
if( !vis ) if (vis == NULL)
vis = glXChooseVisual( disp, scr, sdesc ); {
if( !vis) return TFailure; int anIter = 0;
int anAttribs[11];
anAttribs[anIter++] = GLX_RGBA;
anAttribs[anIter++] = GLX_DEPTH_SIZE;
anAttribs[anIter++] = 1;
anAttribs[anIter++] = GLX_RED_SIZE;
anAttribs[anIter++] = (wattr.depth <= 8) ? 0 : 1;
anAttribs[anIter++] = GLX_GREEN_SIZE;
anAttribs[anIter++] = (wattr.depth <= 8) ? 0 : 1;
anAttribs[anIter++] = GLX_BLUE_SIZE;
anAttribs[anIter++] = (wattr.depth <= 8) ? 0 : 1;
if (DBuffer)
anAttribs[anIter++] = GLX_DOUBLEBUFFER;
anAttribs[anIter++] = None;
vis = glXChooseVisual (disp, scr, anAttribs);
if (vis == NULL) return TFailure;
}
#ifdef TRACE #ifdef TRACE
printf ("TxglCreateWindow \n"); printf ("TxglCreateWindow \n");
@ -271,22 +284,8 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
*/ */
glXGetConfig( disp, vis, GLX_RED_SIZE, &value ); glXGetConfig( disp, vis, GLX_RED_SIZE, &value );
DitherProp = (value < 8) ? True : False;
if ( value < 8 ) { BackDitherProp = (vis->depth <= 8) ? True : False;
DitherProp = True;
}
else
{
DitherProp = False;
}
if ( vis->depth <= 8 ) {
BackDitherProp = True;
}
else
{
BackDitherProp = False;
}
#ifdef TRACE #ifdef TRACE
printf("Dithering %d BackDithering %d \n",DitherProp,BackDitherProp); printf("Dithering %d BackDithering %d \n",DitherProp,BackDitherProp);
@ -334,7 +333,7 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
cwa.border_pixel = color.pixel; cwa.border_pixel = color.pixel;
cwa.background_pixel = color.pixel; cwa.background_pixel = color.pixel;
mask = CWBackPixel | CWColormap | CWBorderPixel | CWEventMask; unsigned long mask = CWBackPixel | CWColormap | CWBorderPixel | CWEventMask;
if( vis->visualid == wattr.visual->visualid ) { if( vis->visualid == wattr.visual->visualid ) {
win = par; win = par;
@ -684,9 +683,9 @@ __declspec( dllexport ) int __fastcall __OpenGl_INIT__ (
} }
if (!i) if (!i)
{ {
errorcode = glGetError(); // if there is no current context it might be impossible to use
errorstring = gluErrorString(errorcode); // glGetError correctly
printf("glXMakeCurrent failed: %d %s\n", errorcode, errorstring); printf("glXMakeCurrent failed!\n");
} }
return i == True ? TSuccess : TFailure; return i == True ? TSuccess : TFailure;