summaryrefslogtreecommitdiffstats
path: root/src/mesa/main
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-045-253/+266
|\ | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
| * mesa: add missing _mesa_lock_texture() callBrian Paul2010-01-041-0/+1
| |
| * mesa: added GL_DU8DV8_ATI in extract_float_rgba()Brian Paul2010-01-041-0/+2
| | | | | | | | Fixes warning seen with Shadowgrounds. See bug 24016.
| * mesa: Prevent possible array out-of-bounds access by _mesa_light.Vinson Lee2010-01-041-15/+32
| |
| * mesa: regenerated enums.c fileBrian Paul2010-01-041-234/+231
| |
| * apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSXJeremy Huddleston2010-01-031-4/+0
| | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]>
* | mesa: more detailed error message in extract_float_rgba()Brian Paul2010-01-041-1/+3
| |
* | fix overflowAlan Hourihane2010-01-041-1/+1
| |
* | mesa: added _mesa_GetBufferParameteri64v()Brian Paul2010-01-022-0/+45
| | | | | | | | This is a new function in GL 3.2. No dispatch for this function yet.
* | mesa: Make condrender.[ch] prototypes match.José Fonseca2010-01-011-2/+2
| | | | | | | | | | | | GLAPI on windows is more than "extern" -- it includes the --, so the mismatch between condrender.[ch] prototypes causes "different linkage" errors on windows.
* | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-312-1/+2
|\| | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
| * mesa: Silence unused variable warning.Vinson Lee2009-12-311-0/+1
| |
| * mesa: Initialize variable in get_tex_color_index.Vinson Lee2009-12-291-1/+1
| |
| * mesa: set version string to 7.7mesa_7_7Ian Romanick2009-12-211-1/+1
| |
* | mesa: remove a line of dead codeBrian Paul2009-12-311-1/+0
| |
* | mesa: enable ColorMaskIndexed in display listsBrian Paul2009-12-311-3/+1
| |
* | mesa: enable GL_EXT_draw_buffers2 for sw driversBrian Paul2009-12-311-0/+1
| |
* | mesa: turn on NV_conditional_render for software driversBrian Paul2009-12-311-0/+1
| |
* | mesa: plug in API functions for conditional renderingBrian Paul2009-12-311-0/+5
| |
* | mesa: added dispatch for GL_NV_conditional_render extensionBrian Paul2009-12-312-2560/+2589
| |
* | mesa: added FLUSH_VERTICES(), more commentsBrian Paul2009-12-311-6/+10
| |
* | mesa: add flag for GL_NV_conditional_render extensionBrian Paul2009-12-313-2/+4
| |
* | mesa: _mesa_Begin/EndConditionalRender() functionsBrian Paul2009-12-314-0/+197
| | | | | | | | | | | | | | For GL_NV_conditional_render and GL3. The drawing functions don't check the query object yet. No API dispatch yet.
* | mesa: make _mesa_lookup_query_object() an non-private inline functionBrian Paul2009-12-312-16/+17
| |
* | mesa: implement _mesa_GetStringi() for GL3Brian Paul2009-12-302-0/+31
| | | | | | | | Note: not plugged into the dispatch table yet.
* | mesa: _mesa_get_enabled_extension() functionBrian Paul2009-12-302-0/+23
| |
* | mesa: implement GL3 GL_NUM_EXTENSIONS queryBrian Paul2009-12-305-0/+46
| |
* | mesa: simplify some extension testing codeBrian Paul2009-12-301-9/+20
| |
* | mesa: display list support for glClearBuffer functionsBrian Paul2009-12-301-0/+154
| | | | | | | | Note: some code disabled until dispatch table supports GL3 entrypoints.
* | mesa: implement GL3 glClearBuffer() functionsBrian Paul2009-12-302-0/+357
| | | | | | | | | | | | | | | | | | | | | | | | These functions clear color/depth/stencil buffers with a value that's passed to the function, rather than the context clear values. For now these functions are implemented in terms of the existing ctx->Driver.Clear() hook. In the future when we have non-normalized integer and unsigned integer color buffer formats we'll need new driver hook(s) to pass int and uint clear values to the driver. Note: these functions are not hooked into the dispatch table at this time.
* | mesa: fix-up blend enable/disable code in _mesa_PopAttrib()Brian Paul2009-12-291-7/+17
| |
* | mesa: finish-up indexed color mask code in _mesa_PopAttrib()Brian Paul2009-12-291-1/+1
| |
* | mesa: plug in GL_EXT_draw_buffers2 functionsBrian Paul2009-12-292-8/+14
| |
* | mesa: regenerate API files related to GL_EXT_draw_buffers2Brian Paul2009-12-291-1286/+1323
| |
* | mesa: added infrastructure for GL_EXT_draw_buffers2Brian Paul2009-12-295-10/+25
| |
* | mesa: add dlist support for indexed colormask and indexed enables/disablesBrian Paul2009-12-291-0/+77
| | | | | | | | Not plugged into dispatch table yet...
* | mesa: implement per-buffer color maskingBrian Paul2009-12-297-37/+132
| | | | | | | | | | | | | | | | | | | | | | 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().
* | mesa: implement indexed glGet functionsBrian Paul2009-12-293-20/+140
| | | | | | | | | | | | | | | | The functions are _mesa_GetBooleanIndexedv(), _mesa_GetIntegerIndexedv(), and _mesa_GetInteger64Indexedv(). These will be called from API functions such as glGetBooleanIndexedvEXT() and glGetBooleani_v(). Only the GL_BLEND query is supported at this time.
* | mesa: per-buffer blend enabled flagsBrian Paul2009-12-297-14/+112
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ctx->Color.BlendEnabled is now a GLbitfield instead of a GLboolean to indicate blend on/off status for each color/draw buffer. This is infrastructure for GL_EXT_draw_buffers2 and OpenGL 3.x New functions include _mesa_EnableIndexed(), _mesa_DisableIndexed(), and _mesa_IsEnabledIndexed(). The enable function corresponds to glEnableIndexedEXT() for GL_EXT_draw_buffers2 or glEnablei() for GL3. Note that there's quite a few tests for ctx->Color.BlendEnabled != 0 in drivers, etc. Those tests can remain as-is since the mask will be 0 or ~0 unless GL_EXT_draw_buffers2 is enabled.
* | mesa: remove unnecessary store.Eric Anholt2009-12-221-3/+0
| |
* | mesa: Remove an unnecessary store reported by clang.Eric Anholt2009-12-221-2/+0
| | | | | | | | | | This was a workaround for a compiler warning that was showing a real error. The real error was later fixed.
* | mesa: Replace CLAMP_SELF() macro with more obvious CLAMP() usage.Eric Anholt2009-12-221-6/+0
| | | | | | | | | | The same code is generated, and readers and static analyzers are happier.
* | mesa: Remove _mesa_exit wrapper for exit().Eric Anholt2009-12-224-17/+3
| | | | | | | | | | It does nothing else while being less useful than exit() because it lacks attributes that real exit() has.
* | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-212-5/+11
|\| | | | | | | | | | | Conflicts: src/mesa/main/version.h src/mesa/state_tracker/st_atom_shader.c
| * Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-211-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: configure.ac progs/demos/morph3d.c progs/demos/textures.c progs/glsl/shtest.c progs/glsl/texaaline.c progs/tests/packedpixels.c progs/xdemos/corender.c src/mesa/main/version.h
| | * mesa: set version string to 7.6.1-rc4Ian Romanick2009-12-161-1/+1
| | |
| | * mesa: add missing semicolonBrian Paul2009-12-161-1/+1
| | | | | | | | | | | | See bug 25663.
| * | mesa: set version string to 7.7-rc3mesa_7_7_rc3Ian Romanick2009-12-161-1/+1
| | |
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchIan Romanick2009-12-162-5/+11
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/unichrome/via_ioctl.c src/mesa/drivers/dri/unichrome/via_screen.c src/mesa/main/version.h src/mesa/state_tracker/st_atom.c
| | * | mesa: set version string to 7.6.1-rc4mesa_7_6_1_rc4Ian Romanick2009-12-161-1/+1
| | |/