Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2009-01-14 | 3 | -8/+7 |
|\ | | | | | | | | | | | | | | | | | | | | | Conflicts: docs/install.html docs/relnotes-7.3.html src/mesa/shader/slang/slang_codegen.c src/mesa/shader/slang/slang_compile.c src/mesa/shader/slang/slang_emit.c src/mesa/shader/slang/slang_preprocess.c src/mesa/shader/slang/slang_preprocess.h | ||||
| * | Build fixes for gcc 2.95 | Matthieu Herrb | 2009-01-11 | 2 | -6/+5 |
| | | |||||
| * | Fix build with GCC 2.95. | Owain G. Ainsworth | 2009-01-11 | 1 | -2/+2 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-15 | 1 | -6/+4 |
|\| | |||||
| * | GLX: Change resulting from previous commit | Ian Romanick | 2008-12-14 | 1 | -6/+4 |
| | | | | | | | | | | | | | | | | Commit db61cbfa2aa241da49589331d8b6875d9a77d826 made modifications to the protocol generator data and scripts. This commit represents the changes to the generated files resulting from the previous changes. This is the client-side part of the fix for bugzilla #11003. | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-12-08 | 1 | -1/+0 |
|\| | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | Bump dri2proto requirement to 1.99.3, drop CopyRegion bitmask from protocol. | Kristian Høgsberg | 2008-12-01 | 1 | -1/+0 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-11-28 | 5 | -23/+163 |
|\| | |||||
| * | Revert "glx: xcbified visual and FBConfig choosing" | RALOVICH, Kristóf | 2008-11-27 | 1 | -103/+6 |
| | | | | | | | | This reverts commit 62688f11355cfa865d420755aa159875b425cc9b. | ||||
| * | Revert "glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX" | RALOVICH, Kristóf | 2008-11-27 | 1 | -0/+58 |
| | | | | | | | | This reverts commit 53698765019e50172be25a4ff48c83d54f0e7981. | ||||
| * | glx: revert using nonexsisten XCB version of glXGetFBConfigsSGIX | RALOVICH, Kristóf | 2008-11-26 | 1 | -58/+0 |
| | | | | | | | | | | | | | | | | This uses a GLX VendorPrivate request. VendorPrivates are real GLX API calls but use the same protocol request. XCB does not currently support specific VendorPrivetes directly. See eg.: http://lists.freedesktop.org/archives/xcb/2008-November/004036.html for more information. | ||||
| * | glx: remove XCB debug leftover | RALOVICH, Kristóf | 2008-11-26 | 1 | -4/+0 |
| | | |||||
| * | glx: xcbified glXSwapBuffers | RALOVICH, Kristóf | 2008-11-26 | 1 | -1/+8 |
| | | |||||
| * | glx: xcbified visual and FBConfig choosing | RALOVICH, Kristóf | 2008-11-26 | 1 | -6/+103 |
| | | |||||
| * | glx: xcbified __glXClientInfo | RALOVICH, Kristóf | 2008-11-26 | 1 | -4/+17 |
| | | |||||
| * | glx: no graphics context during initialization | RALOVICH, Kristóf | 2008-11-26 | 5 | -11/+15 |
| | | |||||
| * | glx: xcbified __glXIsDirect | RALOVICH, Kristóf | 2008-11-26 | 1 | -0/+21 |
| | | |||||
| * | glx: missing static on local function | RALOVICH, Kristóf | 2008-11-26 | 1 | -1/+1 |
| | | |||||
| * | glx: use __glXGetString | RALOVICH, Kristóf | 2008-11-26 | 1 | -3/+1 |
| | | |||||
| * | glx: use __glXQueryServerString | RALOVICH, Kristóf | 2008-11-26 | 2 | -11/+5 |
| | | |||||
| * | glx: implement __glXGetString, hide __glXGetStringFromServer | RALOVICH, Kristóf | 2008-11-26 | 2 | -21/+72 |
| | | |||||
| * | glx: implement QueryVersion using XCB | RALOVICH, Kristóf | 2008-11-26 | 1 | -1/+22 |
| | | |||||
| * | glx: implement __glXQueryServerString using XCB | RALOVICH, Kristóf | 2008-11-26 | 2 | -0/+35 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-24 | 1 | -0/+1 |
|\| | | | | | | | | | | | Conflicts: progs/glsl/Makefile | ||||
| * | glx: Add missing include for XCB, fixing crash on 64-bit. | Bernd Buschinski | 2008-11-24 | 1 | -0/+1 |
| | | | | | | | | Bug #18689 | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Keith Whitwell | 2008-11-15 | 4 | -2/+13 |
|\| | | | | | | | | | | | Conflicts: src/mesa/shader/prog_print.c | ||||
| * | glFlush before CopySubBuffer, fix coordinates and extension name typo. | Kristian Høgsberg | 2008-11-12 | 3 | -2/+8 |
| | | |||||
| * | glx: fix xcb build | Hanno Böck | 2008-11-12 | 1 | -0/+5 |
| | | |||||
* | | Merge commit 'origin/master' into gallium-0.2 | Brian Paul | 2008-11-11 | 44 | -182/+118 |
|\| | | | | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c src/mesa/shader/slang/library/slang_vertex_builtin_gc.h | ||||
| * | Don't mess with emacs tab width. | Kristian Høgsberg | 2008-11-11 | 43 | -43/+0 |
| | | |||||
| * | GLX: fix out-of-bounds memory issue in indirect glAreTexturesResident() | Brian Paul | 2008-11-10 | 2 | -139/+118 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See bug 18445. When getting array results, __glXReadReply() always reads a multiple of four bytes. This can cause writing to invalid memory when 'n' is not a multiple of four. Special-case the glAreTexturesResident() functions now. To fix the bug, we use a temporary buffer that's a multiple of four bytes in length. NOTE: this commit also reverts part of commit 919ec22ecf72aa163e1b97d8c7381002131ed32c (glx/x11: Added some #ifdef GLX_DIRECT_RENDERING protection) which directly edited the indirect.c file rather than the python generator! I'm not repairing that issue at this time. | ||||
* | | Merge commit 'origin/master' into gallium-0.2 | Alan Hourihane | 2008-10-27 | 1 | -1/+1 |
|\| | |||||
| * | glx: updated comment | Kristof Ralovich | 2008-10-21 | 1 | -1/+1 |
| | | |||||
| * | Update DRI2 implementation according to new specification. | Kristian Høgsberg | 2008-10-14 | 7 | -69/+101 |
| | | |||||
| * | Revert pointless reindents to avoid merge conflicts. | Kristian Høgsberg | 2008-10-14 | 7 | -3019/+2893 |
| | | | | | | | | Why are we reindenting code that's work in progress... | ||||
| * | glx: indent -br -i3 -npcs --no-tabs glxclient.h | RALOVICH, Kristóf | 2008-10-13 | 1 | -173/+188 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs glcontextmodes.h | RALOVICH, Kristóf | 2008-10-13 | 1 | -15/+15 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs glxextensions.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -178/+183 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs glxextensions.h | RALOVICH, Kristóf | 2008-10-13 | 1 | -24/+32 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs xfont.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -211/+212 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs xf86dristr.h | RALOVICH, Kristóf | 2008-10-13 | 1 | -207/+232 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs XF86dri.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -461/+493 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs xf86dri.h | RALOVICH, Kristóf | 2008-10-13 | 1 | -52/+53 |
| | | |||||
| * | glx: kill old K&R syntax in XF86dri.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -63/+15 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs vertarr.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -103/+118 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs singlepix.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -138/+145 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs single2.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -681/+718 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs renderpix.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -102/+111 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs render2.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -272/+296 |
| | | |||||
| * | glx: indent -br -i3 -npcs --no-tabs pixelstore.c | RALOVICH, Kristóf | 2008-10-13 | 1 | -254/+271 |
| | |