Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-26 | 2 | -14/+19 |
|\ | | | | | | | Merging was easier than cherry picking in this instance. | ||||
| * | mesa: Don't bind DRAW/READ_FRAMEBUFFER separately without FBO blit support | Erik Wien | 2010-01-26 | 1 | -8/+19 |
| | | | | | | | | | | | | | | | | | | | | | | If GL_EXT_framebuffer_blit was not supported _mesa_DeleteFramebuffersEXT would raise an error when deleting the currently bound framebuffer. This because it tried to bind the default DRAW- and READ_FRAMEBUFFER separately. This patch binds the default FRAMEBUFFER instead in that case. Encountered in the fbo/fbo-copyteximage piglit test on R600. Patch cleaned up a bit by Brian Paul. | ||||
| * | mesa: remove redundant _MaxElement computation | Brian Paul | 2010-01-26 | 1 | -6/+0 |
| | | | | | | | | | | | | | | | | Eric added some new code to check if offset < obj_size before computing _MaxElement but my original code was still present afterward and it clobbered the _MaxElement value. Not sure if this came from a bad merge or what. | ||||
* | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-25 | 1 | -3/+3 |
|\| | | | | | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_screen.c src/mesa/drivers/dri/intel/intel_swapbuffers.c src/mesa/drivers/dri/r300/r300_emit.c src/mesa/drivers/dri/r300/r300_ioctl.c src/mesa/drivers/dri/r300/r300_tex.c src/mesa/drivers/dri/r300/r300_texstate.c | ||||
| * | mesa: move _mesa_debug() call earlier in _mesa_Scissor | Brian Paul | 2010-01-24 | 1 | -3/+3 |
| | | | | | | | | Part of a patch from Xavier Chantry <[email protected]> | ||||
* | | Merge branch 'arb_half_float_vertex' | Dave Airlie | 2010-01-23 | 4 | -2228/+2255 |
|\ \ | |||||
| * | | mesa: add core support for ARB_half_float_vertex. | Dave Airlie | 2010-01-23 | 3 | -0/+24 |
| | | | | | | | | | | | | | | | | | | | | | | | | Adds the extension to the list + support to the APIs. also add t_draw.c support to convert for sw rast. Signed-off-by: Dave Airlie <[email protected]> | ||||
| * | | glapi: add GL_HALF_FLOAT enum support. | Dave Airlie | 2010-01-23 | 1 | -2228/+2231 |
| | | | | | | | | | | | | | | | | | | Regenerate enums files and GLX indirect. Signed-off-by: Dave Airlie <[email protected]> | ||||
* | | | Merge branch 'mesa_7_7_branch' | Brian Paul | 2010-01-22 | 28 | -63/+3 |
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c | ||||
| * | | mesa: Remove unnecessary header from attrib.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from blend.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from buffers.c. | Vinson Lee | 2010-01-18 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from convolve.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Fix typo of 'unknown' in debug.c. | Vinson Lee | 2010-01-18 | 1 | -1/+1 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from debug.c. | Vinson Lee | 2010-01-18 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from depthstencil.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from dlist.c. | Vinson Lee | 2010-01-18 | 1 | -21/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from drawpix.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from enable.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from fbobject.c. | Vinson Lee | 2010-01-18 | 1 | -3/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from formats.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from image.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from lines.c. | Vinson Lee | 2010-01-18 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from mipmap.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from pixel.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from pixelstore.c. | Vinson Lee | 2010-01-18 | 1 | -3/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from points.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from polygon.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from state.c. | Vinson Lee | 2010-01-18 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from texcompress.c. | Vinson Lee | 2010-01-18 | 1 | -3/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from texformat.c. | Vinson Lee | 2010-01-18 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from texgetimage.c. | Vinson Lee | 2010-01-18 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from teximage.c. | Vinson Lee | 2010-01-17 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from texobj.c. | Vinson Lee | 2010-01-17 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary header from texparam.c. | Vinson Lee | 2010-01-17 | 1 | -1/+0 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from texstate.c. | Vinson Lee | 2010-01-17 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: Use preprocessor to comment out code. | Vinson Lee | 2010-01-17 | 1 | -2/+2 |
| | | | |||||
| * | | mesa: Remove unnecessary headers from vtxfmt.c. | Vinson Lee | 2010-01-17 | 1 | -2/+0 |
| | | | |||||
| * | | mesa: bump version to 7.7.1-DEVEL | Brian Paul | 2010-01-05 | 1 | -4/+4 |
| | | | |||||
* | | | glapi: clean-up and simplify glapi_nop.c code | Brian Paul | 2010-01-22 | 1 | -8/+0 |
| |/ |/| | | | | | | | | | Removed _glapi_noop_enable_warnings() and _glapi_set_warning_func(). Just check the DEBUG env vars and call fprintf(stderr) with a warning message instead. | ||||
* | | mesa: minor whitespace fix | Brian Paul | 2010-01-21 | 1 | -1/+1 |
| | | |||||
* | | mesa: support for GL_ARB_fragment_coord_conventions | Luca Barbieri | 2010-01-21 | 2 | -0/+4 |
| | | | | | | | | Signed-off-by: Brian Paul <[email protected]> | ||||
* | | mesa: replace questionable CPU_TO_LE32 macro with function | Brian Paul | 2010-01-20 | 1 | -6/+9 |
| | | |||||
* | | Merge remote branch 'origin/opengl-es-v2' | Chia-I Wu | 2010-01-20 | 11 | -31/+83 |
|\ \ | |||||
| * \ | Merge branch 'master' into opengl-es-v2 | Chia-I Wu | 2010-01-12 | 62 | -4700/+6619 |
| |\ \ | | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h | ||||
| * | | | mesa/main: linear_to_nonlinear is not always available. | Chia-I Wu | 2009-11-06 | 1 | -24/+38 |
| | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | mesa/es: Add support for GL_OES_draw_texture. | Chia-I Wu | 2009-11-05 | 3 | -0/+16 |
| | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | mesa/main: Make _mesa_TexGenf and _mesa_GetTexGenfv global again. | Chia-I Wu | 2009-11-05 | 2 | -2/+8 |
| | | | | | | | | | | | | | | | | | | | | | | | | They are needed by OpenGL ES overlay. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | glapi: Include headers with directory prefixes. | Chia-I Wu | 2009-11-05 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | This allows different sets of generated sources and headers to be used. Signed-off-by: Chia-I Wu <[email protected]> | ||||
| * | | | mesa/main: Add more OpenGL ES types to glheader.h. | Chia-I Wu | 2009-11-05 | 1 | -0/+7 |
| | | | | | | | | | | | | | | | | Signed-off-by: Chia-I Wu <[email protected]> |