Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Export a few glapi functions used by gallium and r300 | Kristian Høgsberg | 2010-01-03 | 3 | -7/+7 |
| | | | | Fixes breakage from -fvisibility-hidden commit. | ||||
* | mesa: fix blend enable/disable calls in meta.c code | Francis Galiegue | 2010-01-03 | 1 | -6/+16 |
| | | | | | | Fixes regression in some DRI drivers since the GL_EXT_draw_buffers2 changes. Signed-off-by: Brian Paul <[email protected]> | ||||
* | 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 | 24 | -320/+415 |
|\ | | | | | | | | | | | | | | | 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 | ||||
| * | swrast: use different temp array in _swrast_get_dest_rgba() | Brian Paul | 2009-12-31 | 1 | -7/+3 |
| | | | | | | | | | | When using multiple color drawbuffers with blending/logicop/masking we were overwriting color values which we still needed. | ||||
| * | mesa: Silence unused variable warning. | Vinson Lee | 2009-12-31 | 1 | -0/+1 |
| | | |||||
| * | st/mesa: add PIPE_FORMAT_Z24S8_UNORM in st_get_format_info() | Brian Paul | 2009-12-29 | 1 | -1/+2 |
| | | | | | | | | | | Fixes progs/demos/fbotexture on Nouveau. Patch submitted by Luca Barbieri <[email protected]>. | ||||
| * | tdfx: Silence uninitialized variable warning. | Vinson Lee | 2009-12-29 | 1 | -1/+1 |
| | | |||||
| * | mesa: Initialize variable in get_tex_color_index. | Vinson Lee | 2009-12-29 | 1 | -1/+1 |
| | | |||||
| * | glsl: added uniform initializer check | Brian Paul | 2009-12-29 | 3 | -0/+12 |
| | | | | | | | | | | | | | | | | | | GLSL 1.10 disallows initializers for uniforms but GLSL 1.20 and later allows them. This patch uses the #version directive to allow/disallow uniform initializers. This addresses bug 25807, but piglit also needs to be fixed to specify the GLSL version in the shader. | ||||
| * | ARB prog parser: use _mesa_add_unnamed_constant() to use fewer constant slots | Brian Paul | 2009-12-29 | 4 | -295/+377 |
| | | | | | | | | | | | | | | | | | | This function will search the constant parameters in an effort to re-use constant slots. For example, {1,2,3,4} and {4,1,1,2} can be stored in one constant slot and accessed with different swizzles. The swizzle info must be propogated though the parsing code in a few places. Fixes Piglit "vpfp-generic tests/shaders/generic/big-param.vpfp" failure. | ||||
| * | intel: Silence compiler warnings. | Vinson Lee | 2009-12-28 | 9 | -14/+16 |
| | | |||||
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branch | Brian Paul | 2009-12-27 | 6 | -3/+6 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h | ||||
| | * | mesa: Remove comma at end of enumerator list. | Vinson Lee | 2009-12-26 | 1 | -1/+1 |
| | | | |||||
| | * | i915: Fix assert. | Vinson Lee | 2009-12-26 | 1 | -1/+1 |
| | | | |||||
| | * | intel: Silence implicit function declaration warning. | Vinson Lee | 2009-12-25 | 1 | -0/+1 |
| | | | |||||
| | * | i965: Fix assert. | Vinson Lee | 2009-12-24 | 1 | -1/+1 |
| | | | |||||
| | * | i965: Add missing va_end. | Vinson Lee | 2009-12-24 | 1 | -0/+1 |
| | | | |||||
| | * | glsl: Initialize member a_obj of struct slang_operation. | Vinson Lee | 2009-12-23 | 1 | -0/+1 |
| | | | |||||
| | * | ffb: Silence compiler warnings. | Vinson Lee | 2009-12-22 | 1 | -1/+1 |
| | | | |||||
| | * | mesa: set version string to 7.6.1mesa_7_6 | Ian Romanick | 2009-12-21 | 1 | -1/+1 |
| | | | |||||
| | * | mesa: Fix missing finite symbol error on Windows. | José Fonseca | 2009-12-21 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | Caused by some weird logic regarding the __WIN32__ define which made the finite definition dependent on the header include order. (cherry picked from commit 622bdecabd73167d2f2f3aff0e223a8c64433f99) | ||||
| | * | mesa: Include <unistd.h> only when one is available. | Michal Krol | 2009-12-21 | 2 | -0/+8 |
| | | | | | | | | | | | | (cherry picked from commit 970823978c2f7d2cf0757aa6ddbd6289b34c476f) | ||||
* | | | 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 |
| | | | |||||
* | | | swrast: add check for conditional rendering | Brian Paul | 2009-12-31 | 5 | -0/+20 |
| | | | |||||
* | | | tnl: add check for conditional rendering | Brian Paul | 2009-12-31 | 1 | -0/+4 |
| | | | |||||
* | | | 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 | 13 | -2994/+3158 |
| | | | |||||
* | | | 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 | 6 | -0/+199 |
| | | | | | | | | | | | | | | | | | | | | | 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 | 11 | -1747/+2138 |
| | | | |||||
* | | | glapi: extension info for GL_EXT_draw_buffers2 | Brian Paul | 2009-12-29 | 1 | -0/+49 |
| | | | |||||
* | | | 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 | 44 | -230/+350 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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(). |