Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-04 | 5 | -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() call | Brian Paul | 2010-01-04 | 1 | -0/+1 |
| | | |||||
| * | mesa: added GL_DU8DV8_ATI in extract_float_rgba() | Brian Paul | 2010-01-04 | 1 | -0/+2 |
| | | | | | | | | Fixes warning seen with Shadowgrounds. See bug 24016. | ||||
| * | mesa: Prevent possible array out-of-bounds access by _mesa_light. | Vinson Lee | 2010-01-04 | 1 | -15/+32 |
| | | |||||
| * | mesa: regenerated enums.c file | Brian Paul | 2010-01-04 | 1 | -234/+231 |
| | | |||||
| * | apple: Purge existing (not working) GLX_USE_APPLEGL from dated libGL on OSX | Jeremy Huddleston | 2010-01-03 | 1 | -4/+0 |
| | | | | | | | | Signed-off-by: Jeremy Huddleston <[email protected]> | ||||
* | | mesa: more detailed error message in extract_float_rgba() | Brian Paul | 2010-01-04 | 1 | -1/+3 |
| | | |||||
* | | fix overflow | Alan Hourihane | 2010-01-04 | 1 | -1/+1 |
| | | |||||
* | | mesa: added _mesa_GetBufferParameteri64v() | Brian Paul | 2010-01-02 | 2 | -0/+45 |
| | | | | | | | | This is a new function in GL 3.2. No dispatch for this function yet. | ||||
* | | mesa: Make condrender.[ch] prototypes match. | José Fonseca | 2010-01-01 | 1 | -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 Paul | 2009-12-31 | 2 | -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 Lee | 2009-12-31 | 1 | -0/+1 |
| | | |||||
| * | mesa: Initialize variable in get_tex_color_index. | Vinson Lee | 2009-12-29 | 1 | -1/+1 |
| | | |||||
| * | mesa: set version string to 7.7mesa_7_7 | Ian Romanick | 2009-12-21 | 1 | -1/+1 |
| | | |||||
* | | mesa: remove a line of dead code | Brian Paul | 2009-12-31 | 1 | -1/+0 |
| | | |||||
* | | mesa: enable ColorMaskIndexed in display lists | Brian Paul | 2009-12-31 | 1 | -3/+1 |
| | | |||||
* | | mesa: enable GL_EXT_draw_buffers2 for sw drivers | Brian Paul | 2009-12-31 | 1 | -0/+1 |
| | | |||||
* | | mesa: turn on NV_conditional_render for software drivers | Brian Paul | 2009-12-31 | 1 | -0/+1 |
| | | |||||
* | | mesa: plug in API functions for conditional rendering | Brian Paul | 2009-12-31 | 1 | -0/+5 |
| | | |||||
* | | mesa: added dispatch for GL_NV_conditional_render extension | Brian Paul | 2009-12-31 | 2 | -2560/+2589 |
| | | |||||
* | | mesa: added FLUSH_VERTICES(), more comments | Brian Paul | 2009-12-31 | 1 | -6/+10 |
| | | |||||
* | | mesa: add flag for GL_NV_conditional_render extension | Brian Paul | 2009-12-31 | 3 | -2/+4 |
| | | |||||
* | | mesa: _mesa_Begin/EndConditionalRender() functions | Brian Paul | 2009-12-31 | 4 | -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 function | Brian Paul | 2009-12-31 | 2 | -16/+17 |
| | | |||||
* | | mesa: implement _mesa_GetStringi() for GL3 | Brian Paul | 2009-12-30 | 2 | -0/+31 |
| | | | | | | | | Note: not plugged into the dispatch table yet. | ||||
* | | mesa: _mesa_get_enabled_extension() function | Brian Paul | 2009-12-30 | 2 | -0/+23 |
| | | |||||
* | | mesa: implement GL3 GL_NUM_EXTENSIONS query | Brian Paul | 2009-12-30 | 5 | -0/+46 |
| | | |||||
* | | mesa: simplify some extension testing code | Brian Paul | 2009-12-30 | 1 | -9/+20 |
| | | |||||
* | | mesa: display list support for glClearBuffer functions | Brian Paul | 2009-12-30 | 1 | -0/+154 |
| | | | | | | | | Note: some code disabled until dispatch table supports GL3 entrypoints. | ||||
* | | mesa: implement GL3 glClearBuffer() functions | Brian Paul | 2009-12-30 | 2 | -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 Paul | 2009-12-29 | 1 | -7/+17 |
| | | |||||
* | | mesa: finish-up indexed color mask code in _mesa_PopAttrib() | Brian Paul | 2009-12-29 | 1 | -1/+1 |
| | | |||||
* | | mesa: plug in GL_EXT_draw_buffers2 functions | Brian Paul | 2009-12-29 | 2 | -8/+14 |
| | | |||||
* | | mesa: regenerate API files related to GL_EXT_draw_buffers2 | Brian Paul | 2009-12-29 | 1 | -1286/+1323 |
| | | |||||
* | | mesa: added infrastructure for GL_EXT_draw_buffers2 | Brian Paul | 2009-12-29 | 5 | -10/+25 |
| | | |||||
* | | mesa: add dlist support for indexed colormask and indexed enables/disables | Brian Paul | 2009-12-29 | 1 | -0/+77 |
| | | | | | | | | Not plugged into dispatch table yet... | ||||
* | | mesa: implement per-buffer color masking | Brian Paul | 2009-12-29 | 7 | -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 functions | Brian Paul | 2009-12-29 | 3 | -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 flags | Brian Paul | 2009-12-29 | 7 | -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 Anholt | 2009-12-22 | 1 | -3/+0 |
| | | |||||
* | | mesa: Remove an unnecessary store reported by clang. | Eric Anholt | 2009-12-22 | 1 | -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 Anholt | 2009-12-22 | 1 | -6/+0 |
| | | | | | | | | | | The same code is generated, and readers and static analyzers are happier. | ||||
* | | mesa: Remove _mesa_exit wrapper for exit(). | Eric Anholt | 2009-12-22 | 4 | -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 Paul | 2009-12-21 | 2 | -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_branch | Brian Paul | 2009-12-21 | 1 | -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-rc4 | Ian Romanick | 2009-12-16 | 1 | -1/+1 |
| | | | |||||
| | * | mesa: add missing semicolon | Brian Paul | 2009-12-16 | 1 | -1/+1 |
| | | | | | | | | | | | | See bug 25663. | ||||
| * | | mesa: set version string to 7.7-rc3mesa_7_7_rc3 | Ian Romanick | 2009-12-16 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Ian Romanick | 2009-12-16 | 2 | -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_rc4 | Ian Romanick | 2009-12-16 | 1 | -1/+1 |
| | |/ |