summaryrefslogtreecommitdiffstats
path: root/src/glx/x11
Commit message (Collapse)AuthorAgeFilesLines
* glx: Fix memory leak if XF86DRICreateDrawable() failsVinson Lee2009-11-021-1/+3
| | | | Signed-off-by: Brian Paul <brianp@vmware.com>
* glx: don't destroy context immediately if it's currently boundBrian Paul2009-10-221-0/+10
| | | | | | | According to the GLXDestroyContext() man page, the context should not immediately be destroyed if it's bound to some thread. Wait until it's unbound to really delete it. The code for doing the later part is already present in MakeContextCurrent() so no change was needed there.
* glx: fix glXQueryContext(GLX_RENDER_TYPE)Brian Paul2009-09-301-0/+6
| | | | | | | | The renderType parameter to CreateContext() was never used. Also, it was often passed as zero. Now when it's zero we check if the context is RGBA or CI mode and set it accordingly. Fixes bug 24211.
* glx: indentation fixesBrian Paul2009-09-291-12/+13
|
* Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-281-0/+7
|\
| * Fix build on non GLIBC platforms (FreeBSD at least)Robert Noland2009-09-281-0/+7
| | | | | | | | | | | | | | | | | | | | Build was broken by commit 9666529b5a5be1fcde82caadc2fe2efa5ea81e49 I'm not certain that this is entirely the correct fix since the demo from bug #23774 seemed to work before the commit that broke the build. Signed-off-by: Robert Noland <rnoland@2hip.net> Signed-off-by: Brian Paul <brianp@vmware.com>
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-222-6/+15
|\| | | | | | | | | | | Conflicts: src/mesa/main/bufferobj.c
| * glx: include string.h to silence missing memset() prototype warningBrian Paul2009-09-221-0/+1
| |
| * GLX: Warn only once about applications calling GLX 1.3 functionsTormod Volden2009-09-211-6/+14
| | | | | | | | | | | | | | | | | | | | The warnings introduced in 1f309c40b8065b8729fce631540c66e4b50b84df would pour out generously from some applications. This patch adds a "warn once" wrapper macro, heavily inspired by src/mesa/drivers/dri/r600/radeon_debug.h Signed-off-by: Tormod Volden <debian.tormod@gmail.com> Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchNicolai Hähnle2009-09-201-3/+7
|\|
| * glx: Use initstate_r / random_r instead of corrupting global random number stateIan Romanick2009-09-161-3/+7
| | | | | | | | | | | | | | | | | | Previously srandom and random were used. This cause the global random number generator state to be modified. This caused problems for applications that called srandom before calling into GLX. By using local state the global state is left unmodified. This should fix bug #23774.
* | Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-151-0/+28
|\|
| * GLX: Complain when buggy applications call GLX 1.3 functions.Ian Romanick2009-09-151-0/+28
| |
* | Merge branch 'mesa_7_5_branch'Michel Dänzer2009-08-301-0/+28
|\| | | | | | | | | Conflicts: src/glx/x11/glxcmds.c
| * glx/x11: Fix glXCreateGLXPixmap for direct rendering.Michel Dänzer2009-08-301-0/+28
| | | | | | | | Fixes progs/xdemos/glxpixmap modified to use direct rendering.
* | glx/dri2: Always use X drawable ID for DRI2 protocol.Michel Dänzer2009-08-221-5/+5
| | | | | | | | Fixes protocol errors in cases where the GLX ID is different.
* | glx: initialize some local vars to silence warnings with -O3Brian Paul2009-08-211-6/+6
| |
* | glx: indent -br -i3 -npcs --no-tabsRALOVICH, Kristóf2009-08-1314-3574/+3705
| | | | | | | | | | Some manual intervention applied since XEXT_* and other macro magic fooled indent. Auto generated files were also skipped.
* | glx: fix signedness warningRALOVICH, Kristóf2009-08-111-1/+1
| |
* | mesa/glapi: regenerated files from gl_API.xmlBrian Paul2009-08-111-0/+4
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-07-305-1/+13
|\|
| * glx: assign per screen driver configs (DRISW)RALOVICH, Kristóf2009-07-281-1/+1
| |
| * glx: assign per screen driver configs (DRI)RALOVICH, Kristóf2009-07-281-0/+2
| |
| * glx: assign per screen driver configs (DRI2)RALOVICH, Kristóf2009-07-281-0/+2
| |
| * glx: properly release DRI configsRALOVICH, Kristóf2009-07-281-0/+6
| | | | | | | | Release per screen DRI driver configs during screen destruction.
| * glx: cache DRI configs in __GLXscreenConfigsRecRALOVICH, Kristóf2009-07-281-0/+2
| |
* | glx: remove XTHREADS supportRALOVICH, Kristóf2009-07-273-60/+5
| |
* | Merge branch 'mesa_7_5_branch'Jakob Bornecrantz2009-07-041-0/+23
|\|
| * GLX/DRI1: Mark GLX visuals with depth != screen depth non-conformant.Michel Dänzer2009-07-071-0/+23
| | | | | | | | | | Such visuals are subject to automatic compositing in the X server, so DRI1 can't render to them properly.
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-302-1/+3
|\| | | | | | | | | | | Conflicts: src/mesa/vbo/vbo_exec_draw.c
| * glx: plug a leakKristof Ralovich2009-06-301-0/+2
| | | | | | | | | | | | | | | | | | Swrast was missing a free for the culmination of driConcatConfigs. Use free(), not _mesa_free() since we shouldn't be calling any Mesa functions from the GLX code. driConcatConfigs() should probably use regular malloc/free to be consistant but the Mesa functions just wrap the libc functions anyway.
| * glx: fix null pointer dereference segfault (bug 22546)Brian Paul2009-06-301-1/+1
| |
* | Merge branch 'mesa_7_5_branch'Brian Paul2009-06-241-0/+14
|\| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/i915/i915_tex_layout.c src/mesa/drivers/dri/i965/brw_wm_glsl.c src/mesa/drivers/dri/intel/intel_buffer_objects.c src/mesa/drivers/dri/intel/intel_pixel_bitmap.c src/mesa/drivers/dri/intel/intel_pixel_draw.c src/mesa/main/enums.c src/mesa/main/texstate.c src/mesa/vbo/vbo_exec_array.c
| * Disable SGI_swap_control extension for DRI2Owen W. Taylor2009-06-221-1/+3
| | | | | | | | | | | | | | | | | | | | We currently don't have support for SGI_swap_control for direct contexts with DRI2, so disable reporting the extension. Reporting the extension, and then having glXSwapIntervalSGI() "succeed" but do nothing can confuse applications. https://bugs.freedesktop.org/show_bug.cgi?id=22123 (cherry picked from commit 279143c6e808b37c333321b696d80df77f709a04)
| * Also release direct rendering resources in glXDestroyGLXPixmap.Michel Dänzer2009-06-191-0/+14
| | | | | | | | Fixes leak running compiz with direct rendering.
| * GLX: attempt to fix glean makeCurrent test cases.Brian Paul2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | Two parts to this: One we don't keep pointers to possibly freed memory anymore once we unbind the drawables from the context. Brian I need to figure out what the comment you made there, can we get a glean/piglit test so we can fix it properly? If the new gc is the same as the oldGC, we call the unbind even though we just bound it in that function. doh. (cherry picked from master, commit 77506dac8e81e9548a7e9680ce367175fe5747af)
* | dri2: Refresh the fake front contents after glXSwapBuffers().Eric Anholt2009-06-231-0/+7
| | | | | | | | | | | | Bug #19177. Reviewed by: Ian Romanick <ian.d.romanick@intel.com>
* | GLX: attempt to fix glean makeCurrent test cases.Dave Airlie2009-06-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | Two parts to this: One we don't keep pointers to possibly freed memory anymore once we unbind the drawables from the context. Brian I need to figure out what the comment you made there, can we get a glean/piglit test so we can fix it properly? If the new gc is the same as the oldGC, we call the unbind even though we just bound it in that function. doh.
* | Disable SGI_swap_control extension for DRI2Owen W. Taylor2009-06-121-1/+3
| | | | | | | | | | | | | | | | | | We currently don't have support for SGI_swap_control for direct contexts with DRI2, so disable reporting the extension. Reporting the extension, and then having glXSwapIntervalSGI() "succeed" but do nothing can confuse applications. https://bugs.freedesktop.org/show_bug.cgi?id=22123
* | Thank you git for doing the right thing.Ian Romanick2009-06-031-94/+1
| |
* | Fix compiling indirect.c when GLX_DIRECT_RENDERING is not definedIan Romanick2009-06-031-0/+138
| | | | | | | | | | DO NOT HAND-EDIT GLX PROTOCOL FILES. Seriously. How can you miss the giant comment at the top of the file?
* | glapi: regenerated files for GL_ARB_copy_bufferBrian Paul2009-06-021-60/+0
|/
* Initialize psp->waitX/waitGL for swrast_dri.so.Aidan Thornton2009-05-181-0/+2
| | | | Fixes http://bugs.freedesktop.org/show_bug.cgi?id=21053 .
* glXChooseVisual: Only consider fbconfig if we can get the corresponding visual.Michel Dänzer2009-05-121-16/+17
| | | | | | | This can fail, e.g. when XLIB_SKIP_ARGB_VISUALS=1 is set. See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=524794 and http://bugs.freedesktop.org/show_bug.cgi?id=21600 .
* glx: replace Xmalloc() calls with Xcalloc()Brian Paul2009-05-042-2/+2
| | | | Fixes a bug where psp->WaitX was uninitialized. Reported by Chris Clayton.
* DRI2: Implement interface for drivers to access DRI2GetBuffersWithFormatIan Romanick2009-04-241-19/+85
| | | | | Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kristian Høgsberg <krh@redhat.com>
* DRI2: Implement protocol for DRI2GetBuffersWithFormatIan Romanick2009-04-242-0/+80
| | | | | Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kristian Høgsberg <krh@redhat.com>
* glx: added null pointer check in glXGetFBConfigs()Brian Paul2009-04-151-1/+2
| | | | Fixes segfault seen with glxinfo with NVIDIA OpenGL.
* glx: Make glXGetScreenDriver() work for DRI2Adam Jackson2009-04-141-21/+35
|
* DRI2: Assume that there is always a front bufferIan Romanick2009-04-091-7/+3
| | | | | | | | Assume that the front-buffer exists even if the server didn't tell the client that it exists. Signed-off-by: Ian Romanick <ian.d.romanick@intel.com> Reviewed-by: Kristian Høgsberg <krh@redhat.com>