paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-22 05:59:28 +02:00
Code Issues Packages Projects Releases Wiki Activity

openglcontrol: fixes for gtk1

Browse Source 
git-svn-id: trunk@40440 -
This commit is contained in:
mattias 2013-02-27 22:19:17 +00:00
parent 45d9589aad
commit cd7f987b4b
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/opengl/example/imguimain.pas
View File

@ -474,7 +474,7 @@ begin
glGetIntegerv(GL_SAMPLE_BUFFERS,@samplebuffers);
glGetIntegerv(GL_SAMPLES,@samples);
DebugLn(['SampleBuffers: ',samplebuffers]);
debugln(['Samples: ',samples]);
Debugln(['Samples: ',samples]);
first:=false;
end;
//setup 2D projection

13
components/opengl/glgtkglxcontext.pas
View File

@ -147,6 +147,10 @@ function gtk_gl_area_make_current(glarea: PGtkGLArea): boolean;
function gtk_gl_area_begingl(glarea: PGtkGLArea): boolean;
procedure gtk_gl_area_swap_buffers(gl_area: PGtkGLArea);
{$IFDEF lclgtk}
function gdk_x11_get_default_xdisplay:PDisplay;cdecl;external;
function gdk_x11_get_default_screen:gint;cdecl;external;
{$ENDIF}
procedure LOpenGLViewport(Left, Top, Width, Height: integer);
procedure LOpenGLSwapBuffers(Handle: HWND);
@ -775,9 +779,14 @@ begin
ColorMap:=gdk_colormap_get_system;
Visual:=gdk_colormap_get_visual(ColorMap);
if GDK_VISUAL_XVISUAL(Visual)^.visualid<>XVInfo^.visualid then begin
if XVisualIDFromVisual(
GDK_VISUAL_XVISUAL({$IFDEF LCLGTK}PGdkVisualPrivate(visual)
{$ELSE}visual
{$ENDIF}))
<>XVInfo^.visualid
then begin
Visual:=gdkx_visual_get(XVInfo^.visualid);
ColorMap:=gdk_colormap_new(Visual, gFALSE);
ColorMap:=gdk_colormap_new(Visual, {$IFDEF LCLGTK2}gFALSE{$ELSE}0{$ENDIF});
end;
GLArea:=gtk_type_new(gtk_gl_area_get_type);