summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into r300-compilerNicolai Hähnle2009-09-21323-10554/+16491
|\ | | | | | | | | | | | | | | | | | | There were additional non-textual conflicts. Conflicts: src/gallium/drivers/r300/r300_tgsi_to_rc.c src/mesa/drivers/dri/r300/compiler/r3xx_vertprog.c src/mesa/drivers/dri/r300/compiler/radeon_program.c src/mesa/drivers/dri/r300/compiler/radeon_program_alu.c
| * Merge branch 'mesa_7_6_branch'Nicolai Hähnle2009-09-214-6/+62
| |\
| | * r300: Zero-initialize register for NV_vertex_programNicolai Hähnle2009-09-212-0/+32
| | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]>
| | * r300: Fix handling of NV_vertex_program parametersNicolai Hähnle2009-09-212-6/+30
| | | | | | | | | | | | | | | | | | | | | The handling is a bit inefficient, unfortunately, but I don't want to make any intrusive changes for Mesa 7.6. Signed-off-by: Nicolai Hähnle <[email protected]>
| * | Merge branch 'mesa_7_6_branch'Michel Dänzer2009-09-215-18/+25
| |\|
| | * Merge branch 'mesa_7_5_branch' into mesa_7_6_branchMichel Dänzer2009-09-211-1/+2
| | |\
| | | * intel: Fix crash in intel_flush().Michel Dänzer2009-09-211-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | Since commit 2921a2555d0a76fa649b23c31e3264bbc78b2ff5 ('intel: Deassociated drawables from private context struct in intelUnbindContext'), intel->driDrawable may be NULL in intel_flush().
| | * | radeon: Fix legacy bo not to reuse dma buffers before refcount is 1.Pauli Nieminen2009-09-201-2/+7
| | | | | | | | | | | | | | | | | | | | This should help detecting possible memory leaks with dma buffers and prevent possible visual corruption if data would be overwriten too early.
| | * | r300/compiler: Fix trig instructions in R300 fpNicolai Hähnle2009-09-201-9/+9
| | | | | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]>
| | * | radeon: Fix typo in variable name.Pauli Nieminen2009-09-201-1/+1
| | | |
| | * | radeon: Improve WARN_ONCE macro to appear as single statement.Pauli Nieminen2009-09-201-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | Do-while makes macro safe to be used with if and for constructions. Also remove __LINE__ macro from variable name because scope is local to macro anyway.
| | * | radeon: Fix "verts" debugging enableNicolai Hähnle2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Copy'n'paste apparently prevented the RADEON_VERTS flag from being enabled. Signed-off-by: Nicolai Hähnle <[email protected]>
| * | | nouveau: allow building modesetting_drv.soBen Skeggs2009-09-212-0/+210
| | | |
| * | | nouveau: drm_api create_screen()'s 'arg' argument can be NULLBen Skeggs2009-09-211-1/+1
| | | |
| * | | windows: call _mesa_meta_init/free()Brian Paul2009-09-201-0/+5
| | | |
| * | | xlib: always call _mesa_meta_init/free()Brian Paul2009-09-201-4/+2
| | | |
| * | | dri/swrast: call _mesa_meta_init/free()Brian Paul2009-09-201-0/+4
| | | |
| * | | osmesa: call _mesa_meta_init/free()Brian Paul2009-09-201-0/+5
| | | |
| * | | Revert "st/mesa: Compile in meta.c."Brian Paul2009-09-201-1/+0
| | | | | | | | | | | | | | | | This reverts commit 6c5726cd39ab12b86fae391d075fa74bc24b615c.
| * | | Revert "scons: add meta.c to sources"Brian Paul2009-09-201-5/+0
| | | | | | | | | | | | | | | | This reverts commit 41fefe88c50376a57876b498c8619c8c9f535de6.
| * | | Revert "mesa: move _mesa_meta_init/free() calls to core Mesa"Brian Paul2009-09-204-5/+17
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 651cffd626a82d9bf539437ca4bdf8ea4b396fab. The commit inadvertantly introduced a new gallium dependency on the meta code.
| * | | scons: add meta.c to sourcesBrian Paul2009-09-201-0/+5
| | | |
| * | | st/mesa: Compile in meta.c.Chia-I Wu2009-09-201-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | meta was moved to core Mesa since 651cffd626a82d9bf539437ca4bdf8ea4b396fab. Signed-off-by: Chia-I Wu <[email protected]>
| * | | intel: meta clear has a new name.Chia-I Wu2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | It was renamed to _mesa_meta_Clear. Signed-off-by: Chia-I Wu <[email protected]>
| * | | xorg/st: fixup builds against later dpms headers.Dave Airlie2009-09-212-0/+8
| | | |
| * | | llvmpipe: Fix lp_get_cached_tile.José Fonseca2009-09-201-1/+1
| | | | | | | | | | | | | | | | Align coordinates to tile boundaries.
| * | | llvmpipe: Update tile status on flush.José Fonseca2009-09-201-0/+3
| | | |
| * | | Merge branch 'mesa_7_6_branch'Brian Paul2009-09-207-18/+41
| |\| | | | | | | | | | | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_clear.c
| | * | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchNicolai Hähnle2009-09-203-8/+21
| | |\|
| | | * mesa/st: Initialize format bits of framebuffer renderbuffersNicolai Hähnle2009-09-201-0/+1
| | | | | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]>
| | | * glx: Use initstate_r / random_r instead of corrupting global random number stateIan Romanick2009-09-161-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously srandom and random were used. This cause the global random number generator state to be modified. This caused problems for applications that called srandom before calling into GLX. By using local state the global state is left unmodified. This should fix bug #23774.
| | | * st/mesa: fix some incorrect branching/clean-up code in TexImage functionsBrian Paul2009-09-161-3/+3
| | | | | | | | | | | | | | | | | | | | We need to be sure to call the _mesa_unmap_teximage_pbo() function if we called _mesa_validate_pbo_teximage().
| | | * st/mesa: fix texture memory allocation bugBrian Paul2009-09-161-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The following example caused an incorrect GL_OUT_OF_MEMORY error to be raised in glTexSubImage2D: glTexImage2D(level=0, width=32, height=32, pixels=NULL); glTexImage2D(level=0, width=64, height=64, pixels=NULL); glTexSubImage2D(level=0, pixels!=NULL); The second glTexImage2D() call needs to cause the first image to be deallocated then reallocated at the new size. This was not happening because we were testing for pixels==NULL too early.
| | * | mesa/st: Create front renderbuffer on the fly when supplied with a surfaceNicolai Hähnle2009-09-201-3/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Normally, the mesa/st would create a fake front buffer out of a client-allocated surface. In the DRI setting, however, st/dri provides a front buffer surface which is created and maintained by the X server. Prefer to use this surface instead, so that front buffer rendering and reading works correctly. Signed-off-by: Nicolai Hähnle <[email protected]>
| | * | r300/compiler: Fix R300 fragment program regression introduced by 0723cd1...Nicolai Hähnle2009-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | We obviously need to move the code addr register backwards because their may be overlap. This bug affected in particular the Compiz water plugin. Signed-off-by: Nicolai Hähnle <[email protected]>
| | * | [i965] add a missing header fileZou Nan hai2009-09-181-0/+1
| | | |
| | * | [i965] use intel_batchbuffer_flush to flush the clearZou Nan hai2009-09-181-1/+2
| | | |
| | * | mesa: fix clip plane, fog issuesBrian Paul2009-09-161-4/+0
| | | |
| * | | mesa: remove redundant readbuffer checkBrian Paul2009-09-191-5/+0
| | | |
| * | | mesa: rename functions to be more consistant with rest of mesaBrian Paul2009-09-199-55/+54
| | | |
| * | | swrast: remove obsolete s_imaging.c fileBrian Paul2009-09-191-176/+0
| | | |
| * | | swrast: remove prototypes for obsolete functionsBrian Paul2009-09-191-21/+0
| | | |
| * | | mesa: remove s_imaging.c from buildBrian Paul2009-09-191-1/+0
| | | |
| * | | windows: replace old ColorTable, Convolution functions with newBrian Paul2009-09-193-12/+12
| | | |
| * | | mesa: use new meta functionsBrian Paul2009-09-191-4/+4
| | | |
| * | | mesa: meta functions for glCopyColorTable, glCopyConvolutionFilter, etcBrian Paul2009-09-192-0/+141
| | | |
| * | | mesa: move readbuffer testsBrian Paul2009-09-193-21/+16
| | | |
| * | | mesa: use _mesa_get_current_tex_unit() helperBrian Paul2009-09-191-4/+5
| | | |
| * | | mesa: use _mesa_get_current_tex_unit() helperBrian Paul2009-09-191-5/+6
| | | |
| * | | mesa: fix some glCopyTex[Sub]Image regressions related to convolutionBrian Paul2009-09-191-0/+26
| | | |