paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-18 01:39:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Qt5: make OpenGL compatibile with Mesa. Patch by Chris Rorden. issue #36473

Browse Source 
git-svn-id: trunk@62454 -
This commit is contained in:
zeljko 2019-12-29 10:48:52 +00:00
parent ae474d63cb
commit f38e21c5ae
1 changed files with 26 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
components/opengl/glqtcontext.pas
View File

@ -273,7 +273,6 @@ function LOpenGLCreateContext(AWinControl: TWinControl;
const RedBits, GreenBits, BlueBits, MajorVersion, MinorVersion, const RedBits, GreenBits, BlueBits, MajorVersion, MinorVersion,
MultiSampling, AlphaBits, DepthBits, StencilBits, AUXBuffers: Cardinal; MultiSampling, AlphaBits, DepthBits, StencilBits, AUXBuffers: Cardinal;
const AParams: TCreateParams): HWND; const AParams: TCreateParams): HWND;
var var
{$IFDEF ModernGL} { Used with glXCreateContextAttribsARB to select 3.X and above context } {$IFDEF ModernGL} { Used with glXCreateContextAttribsARB to select 3.X and above context }
Context3X: array [0..6] of Integer; Context3X: array [0..6] of Integer;
@ -323,16 +322,30 @@ begin
AttrList.ContextFlags:=0; AttrList.ContextFlags:=0;
//if DebugContext then //if DebugContext then
// AttrList.ContextFlags:=Attribs.ContextFlags or GLX_CONTEXT_DEBUG_BIT_ARB; // AttrList.ContextFlags:=Attribs.ContextFlags or GLX_CONTEXT_DEBUG_BIT_ARB;
if (MultiSampling > 1) and GLX_ARB_multisample(XDisplay,ScreenNum) then if (MultiSampling > 1) and GLX_ARB_multisample(XDisplay,ScreenNum) then begin
AttrList.MultiSampling := MultiSampling AttrList.MultiSampling := MultiSampling;
else end else begin
AttrList.MultiSampling:=0; AttrList.MultiSampling:=0;
{$IFDEF UNIX}writeln('Multi-sampling not supported');{$ENDIF}
end;
FBConfigsCount:=0; FBConfigsCount:=0;
FBConfigs:=glXChooseFBConfig(XDisplay, ScreenNum, @AttrList.AttributeList[0], FBConfigsCount); FBConfigs:=glXChooseFBConfig(XDisplay, ScreenNum, @AttrList.AttributeList[0], FBConfigsCount);
if FBConfigsCount = 0 then if FBConfigsCount = 0 then begin
{$IFDEF UNIX}writeln('Could not find FB config: will try without multi-sampling');{$ENDIF}
FreeMem(AttrList.AttributeList);
AttrList.AttributeList := CreateOpenGLContextAttrList(DoubleBuffered,RGBA,RedBits,GreenBits,BlueBits,AlphaBits,DepthBits,StencilBits,AUXBuffers, 0);
AttrList.MajorVersion:=MajorVersion;
AttrList.MinorVersion:=MinorVersion;
// fill in context flags
AttrList.ContextFlags:=0;
FBConfigs:=glXChooseFBConfig(XDisplay, ScreenNum, @AttrList.AttributeList[0], FBConfigsCount);
end;
if FBConfigsCount = 0 then begin
raise Exception.Create('Could not find FB config'); raise Exception.Create('Could not find FB config');
//{$IFDEF UNIX}writeln('Could not find FB config: this may end poorly.');{$ENDIF}
//NewQtWidget.glxcontext := glXCreateContext(NewQtWidget.xdisplay,NewQtWidget.visual, nil, direct);
//goto 123;
end;
// if multisampling is requested try to get a number of sample buffers as // if multisampling is requested try to get a number of sample buffers as
// close to the specified number as possible // close to the specified number as possible
if AttrList.MultiSampling > 0 then if AttrList.MultiSampling > 0 then
@ -416,6 +429,7 @@ begin
{$ENDIF} {$ENDIF}
NewQtWidget.glxcontext := glXCreateContext(NewQtWidget.xdisplay, NewQtWidget.glxcontext := glXCreateContext(NewQtWidget.xdisplay,
NewQtWidget.visual, nil, direct); NewQtWidget.visual, nil, direct);
//123:
NewQtWidget.ref_count := 1; NewQtWidget.ref_count := 1;
NewQtWidget.AttachEvents; NewQtWidget.AttachEvents;
@ -449,10 +463,12 @@ var
procedure CreateList; procedure CreateList;
begin begin
p:=0; p:=0;
//UseFBConfig := false;
if UseFBConfig then if UseFBConfig then
begin begin
Add(GLX_X_RENDERABLE); Add(1); Add(GLX_X_RENDERABLE); Add(1);
Add(GLX_X_VISUAL_TYPE); Add(GLX_TRUE_COLOR); Add(GLX_X_VISUAL_TYPE);
Add(GLX_TRUE_COLOR);
end; end;
if DoubleBuffered then if DoubleBuffered then
begin begin
@ -485,7 +501,7 @@ var
Add(GLX_AUX_BUFFERS); Add(AUXBuffers); Add(GLX_AUX_BUFFERS); Add(AUXBuffers);
end; end;
{$IFDEF ModernGL} {$IFDEF ModernGL}
if MultiSampling>0 then if MultiSampling>1 then
begin begin
Add(GLX_SAMPLE_BUFFERS); Add(1); Add(GLX_SAMPLE_BUFFERS); Add(1);
Add(GLX_SAMPLES); Add(MultiSampling); Add(GLX_SAMPLES); Add(MultiSampling);