aboutsummaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/x11
Commit message (Collapse)AuthorAgeFilesLines
* DRI2/GLX: add INTEL_swap_event supportJesse Barnes2010-01-081-0/+3
| | | | | | | Add event support for the GLX swap buffers event, along with DRI2 protocol support for generating GLX swap buffers events in the direct rendered case. Signed-off-by: Jesse Barnes <[email protected]>
* mesa: implement per-buffer color maskingBrian Paul2009-12-291-1/+1
| | | | | | | | | | | This is part of the GL_EXT_draw_buffers2 extension and part of GL 3.0. The ctx->Color.ColorMask field is now a 2-D array. Until drivers are modified to support per-buffer color masking, they can just look at the 0th color mask. The new _mesa_ColorMaskIndexed() function will be called by glColorMaskIndexedEXT() or glColorMaski().
* Merge branch 'mesa_7_6_branch'Ian Romanick2009-11-061-4/+4
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This should fix the memory leaks in the assembly parser without the regressions. The conflicts in program_lexer.l were related to changes in returning strings between the branches (always return IDENTIFIER vs. returing either IDENTIFIER or USED_IDENTIFIER). The conflicts in program_parse.y were related to two changes in master One change prints a variable name in an error message. The other change adds outputVarSize to the OUTPUT_statement rule. The cause the position of the IDENTIFIER to change from $2 to $3. Conflicts: src/mesa/shader/lex.yy.c src/mesa/shader/program_lexer.l src/mesa/shader/program_parse.tab.c src/mesa/shader/program_parse.y
| * xmesa: pass pixmap to clip_for_xgetimage()Brian Paul2009-11-051-4/+4
| | | | | | | | | | | | The code was assuming ctx->DrawBuffer == ctx->ReadBuffer. Passing the pixmap is simpler and better. Fixes a potential segfault.
* | Merge branch 'texformat-rework'Brian Paul2009-10-282-10/+8
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/radeon/radeon_fbo.c src/mesa/drivers/dri/s3v/s3v_tex.c src/mesa/drivers/dri/s3v/s3v_xmesa.c src/mesa/drivers/dri/trident/trident_context.c src/mesa/main/debug.c src/mesa/main/mipmap.c src/mesa/main/texformat.c src/mesa/main/texgetimage.c
| * | mesa: remove a bunch of gl_renderbuffer fieldsBrian Paul2009-10-082-7/+5
| | | | | | | | | | | | | | | | | | _ActualFormat is replaced by Format (MESA_FORMAT_x). ColorEncoding, ComponentType, RedBits, GreenBits, BlueBits, etc. are all replaced by MESA_FORMAT_x queries.
| * | mesa: remove GLchan-based formats; use hw 8-bit/channel formats insteadBrian Paul2009-09-301-2/+2
| | | | | | | | | | | | Removed: MESA_FORMAT_RGBA, RGB, ALPHA, LUMINANCE, LUMINANCE_ALPHA, INTENSITY.
| * | mesa: replace gl_texture_format with gl_formatBrian Paul2009-09-301-3/+3
| | | | | | | | | | | | | | | | | | Now gl_texture_image::TexFormat is a simple MESA_FORMAT_x enum. ctx->Driver.ChooseTexture format also returns a MESA_FORMAT_x. gl_texture_format will go away next.
* | | mesa: Enable remap table in core.Chia-I Wu2009-10-231-73/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This enables the remap table in core. driInitExtensions is adapted to use the remap table. All uses of extension_helper.h are replaced by remap_helper.h. The chicken-egg problem of the DRI drivers is also solved. It is now also possible to pass NULL extensions to driInitExtensions. It will cause driInitExtensions to map all known functions. This functionality is used by software drivers and EGL_i915. Signed-off-by: Chia-I Wu <[email protected]>
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-081-4/+6
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: src/mesa/drivers/common/meta.c
| * | mesa/xlib: call XQueryExtension() in glXQueryExtension()Brian Paul2009-10-071-4/+6
| | | | | | | | | | | | See bug 24321.
* | | Merge branch 'mesa_7_6_branch'Nicolai Hähnle2009-10-072-15/+33
|\| |
| * | mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320Brian Paul2009-10-072-12/+28
| | |
| * | mesa/xlib: return 0 for errorBase, eventBase in glXQueryExtension()Brian Paul2009-10-071-3/+5
| | | | | | | | | | | | | | | A little better than leaving the values undefined, I think. See bug 24321.
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-051-2/+2
|\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_cpu_detect.c
| * | xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual()Brian Paul2009-10-021-2/+2
| | | | | | | | | | | | The parameter is a bitmask.
* | | Merge branch 'mesa_7_6_branch'Brian Paul2009-10-011-2/+2
|\| | | |/ |/|
| * mesa/xlib: fix GLX_RENDER_TYPE queryBrian Paul2009-09-291-2/+2
| | | | | | | | Return GLX_RGBA_TYPE or GLX_COLOR_INDEX_TYPE.
* | xlib: always call _mesa_meta_init/free()Brian Paul2009-09-201-4/+2
| |
* | Revert "mesa: move _mesa_meta_init/free() calls to core Mesa"Brian Paul2009-09-201-0/+7
| | | | | | | | | | | | This reverts commit 651cffd626a82d9bf539437ca4bdf8ea4b396fab. The commit inadvertantly introduced a new gallium dependency on the meta code.
* | mesa: rename functions to be more consistant with rest of mesaBrian Paul2009-09-191-5/+5
| |
* | mesa: move _mesa_meta_init/free() calls to core MesaBrian Paul2009-09-191-7/+0
| |
* | mesa: Add support for ARB_draw_elements_base_vertex.Eric Anholt2009-09-081-0/+2
| |
* | mesa: Expose NV_depth_clamp if ARB_depth_clamp is supported.Eric Anholt2009-09-081-0/+1
| | | | | | | | | | | | The wording of these two is exactly the same, except for the issue "Can fragments with wc<=0 be generated when this extension is supported?", which idr thinks is a non-issue for us.
* | mesa: Add support for ARB_depth_clamp.Eric Anholt2009-09-081-0/+1
| | | | | | | | | | This currently doesn't include fixing up the cliptests in the assembly paths to support ARB_depth_clamp, so enabling depth_clamp forces the C path.
* | xlib: test _mesa_meta_bitmap()Brian Paul2009-09-061-0/+1
| |
* | xlib: move misplaced braceBrian Paul2009-09-061-1/+1
|/
* Add ARB_sync to the xorg sw dri driver.Eric Anholt2009-09-031-0/+2
|
* xlib: plug in more meta functions, if TEST_META_FUNCS is setBrian Paul2009-08-311-13/+15
|
* xlib: option to enable/test meta functions (disabled)Brian Paul2009-08-313-4/+22
|
* Merge branch 'mesa_7_5_branch'Brian Paul2009-06-241-1/+1
|\ | | | | | | | | | | | | | | | | | | | | | | | | 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
| * mesa: added null ptr check in Fake_glXCreatePixmap()Brian Paul2009-06-171-1/+1
| | | | | | | | Fixes segfault in progs/xdemos/glxgears_pixmap.c
* | mesa: in glReadBufer() set _NEW_BUFFERS, not _NEW_PIXELBrian Paul2009-05-011-1/+2
|/ | | | | | | | | | | | | | | Since GL_READ_BUFFER is historically part of the gl_pixel_attrib group it made sense to signal changes with _NEW_PIXEL. But now with FBOs it's also part of the framebuffer state. Now _NEW_PIXEL strictly indicates pixels transfer state changes. This change avoids framebuffer state validation when any random bit of pixel-transfer state is set. DRI drivers updated too: don't check _NEW_COLOR when updating framebuffer state. I think that was just copied from the Xlib driver because we care about dither enable/disable state there.
* Use the specified X11 headers for xlib mesaDan Nicholson2009-03-181-1/+2
| | | | | The xlib build was using the system's Xlib headers or bombing if they weren't available.
* xmesa: set back-buffer's drawable fieldBrian Paul2009-03-091-0/+1
| | | | Fixes back-buffer rendering when MESA_BACK_BUFFER=pixmap
* xlib: code to force fixed function -> shader translation (for debug, disabled)Brian Paul2009-03-031-0/+8
|
* mesa: comments and code documenting a bug with depth 32 TrueColor ↵Brian Paul2009-03-021-0/+18
| | | | | | | | | | drawing/reading It seems that XGetImage() from a depth 32 TrueColor window is flakey. Drawing with XPutImage() instead of XPutPixel() seems to work better, but still not perfectly. Keep using the original code for now until more is learned.
* mesa: remove unused AUX buffersBrian Paul2009-03-021-3/+0
| | | | | | Remove all references to aux buffers 1..3. Keep AUX0 around for now just in case, but it'll probably go too someday. I don't know of any OpenGL drivers since the IRIX days that support aux color buffers.
* mesa: fix _glxapi_get_proc_address() for mangled namesTom Fogal2009-02-231-0/+5
|
* mesa: move a bunch of compiler-related stuff into new compiler.h headerBrian Paul2009-02-221-0/+1
| | | | This trims down and cleans up imports.h and glheader.h quite a bit.
* mesa: use an array for current texture objectsBrian Paul2009-02-211-3/+3
| | | | Use loops to consolidate lots of texture object code.
* mesa: replace _mesa_unreference_framebuffer() with _mesa_reference_framebuffer()Brian Paul2009-02-091-1/+1
|
* mesa: make Xlib glXIsDirect() always return TrueBrian Paul2009-02-041-3/+3
|
* xlib: use MESA_GLX_FORCE_DIRECT to make glXIsDirect() always return TrueBrian Paul2009-02-031-20/+25
| | | | | Some apps won't run w/ indirect rendering contexts. Also, consolidate some context-init code in new init_glx_context() function.
* Make GL_{EXT,SUN}_multi_draw_arrays and GL_IBM_multimode_draw_arrays mandatoryIan Romanick2009-01-281-2/+0
| | | | Signed-off-by: Ian Romanick <[email protected]>
* mesa: deprecate the GL/fxmesa.h headerBrian Paul2009-01-102-1/+104
|
* xmesa: deprecate the "XMesa" interfaceBrian Paul2009-01-107-4/+709
| | | | | Move the include/GL/xmesa*.h files to src/mesa/drivers/x11/ so they're no longer considered public.
* mesa: improved driver query interfaceKeith Whitwell2008-09-211-4/+4
| | | | Brought over from gallium-0.2 branch.
* mesa: prefix more #includes with "main/"Brian Paul2008-09-1810-48/+48
|
* Apple: Cleaned up some linking and dylib ids issuesJeremy Huddleston2008-08-111-0/+1
|