summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-212-4/+4
|\
| * intel: Mark the FBO as incomplete if there's no intel_renderbuffer for it.Eric Anholt2009-09-211-0/+5
| | | | | | | | | | | | | | This happens to rendering with textures with a border, which had resulted in a segfault on dereferencing the irb. (cherry-picked from commit 8bba183b9eeb162661a287bf2e118c6dd419dd24)
| * softpipe: Fix cube face selection.Brian Paul2009-09-211-2/+2
| | | | | | | | | | | | | | If arx and ary are equal, we still want to choose from one of them, and not arz. (cherry picked from commit de685b37a91bc95dd4093a44a49b7b47385b1f7c)
| * swrast: fix cube face selectionBrian Paul2009-09-211-2/+2
| | | | | | | | | | | | | | If arx and ary are equal, we still want to choose from one of them, and not arz. This is the same as Michal's softpipe fix.
* | mesa: refine the error checking vbo_exec_DrawRangeElements()Brian Paul2009-09-211-4/+31
| | | | | | | | | | | | | | | | | | | | If the 'end' index is out of bounds issue a warning as before. But instead of just no-op'ing the draw call, examine the actual array indices to see if they're OK. If the max array index is out of bounds, issue another warning and no-op the draw call. Otherwise, draw normally. This is a debug build-only feature since it could impact performance. This "fixes" the missing torus in the OGL Distilled / Picking demo.
* | mesa: make max_buffer_index() a non-static functionBrian Paul2009-09-212-8/+14
| |
* | radeon: update buffer map/unmap code for changes introduced in ↵Maciej Cencora2009-09-211-2/+9
| | | | | | | | 92033a9516942d7272ce4bf36ecd422009bbaf60 and 822c7964819ca1fcc270880d4ca8b3de8a4276d0
* | mesa: add some debug info to teximage.cMaciej Cencora2009-09-211-0/+87
| |
* | r300: fix a typoMaciej Cencora2009-09-211-1/+1
| |
* | 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_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]>
* | 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
| |
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-162-0/+667
|\| | | | | | | | | Conflicts: src/mesa/main/dlist.c
| * intel: Deassociated drawables from private context struct in intelUnbindContextIan Romanick2009-09-161-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | The generic DRI infrastructure makes sure that __DRIcontextRec::driDrawablePriv and __DRIcontextRec::driReadablePriv are set to NULL after unbinding a context. However, the intel_context structure keeps cached copies of these pointers. If these cached pointers are not NULLed and the drawable is actually destroyed after unbinding the context (typically by way of glXDestroyWindow), freed memory will be dereferenced in intelDestroyContext. This should fix bug #23418.
| * mesa: compile glUniformMatrix() functions into display listsBrian Paul2009-09-151-0/+242
| | | | | | | | | | I believe this is the last of the shader-related functions that needed display list treatment.
| * mesa: implement more glUniform display list functionsBrian Paul2009-09-151-1/+365
| |
| * mesa: compile glUniform4f() into display listsBrian Paul2009-09-151-0/+26
| | | | | | | | Note: there are more glUniform functions to compile...
| * mesa: compile glUseProgram/glUseProgramObjectARB into display listsBrian Paul2009-09-151-0/+28
| | | | | | | | Fixes bug 23746
* | i965: do a flush in clear, fix openarena render issue,Zou Nan hai2009-09-161-0/+1
| | | | | | | | fd.o bug# 23857
* | Merge commit 'origin/mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-151-0/+28
|\|
| * GLX: Complain when buggy applications call GLX 1.3 functions.Ian Romanick2009-09-151-0/+28
| |
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-153-3/+46
|\|
| * glsl: added some link debug code (disabled)Brian Paul2009-09-141-0/+15
| |
| * glsl: remove extra #version directives from concatenated shader sourcesBrian Paul2009-09-141-0/+28
| | | | | | | | | | | | | | | | When we concatenate shaders to do our form of poor-man linking, if there's multiple #version directives, preprocessing fails. This change disables the extra #version directives by changing the first two chars to //. This should help with some Wine issues such as bug 23946.
| * mesa: raise GL_INVALID_ENUM not GL_INVALID_VALUE for glTexParamter errorsVinson Lee2009-09-111-3/+3
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
* | gallium: Add Mac OS to pipe/p_thread.h.Vinson Lee2009-09-141-5/+5
| | | | | | | | Mac OS also has POSIX threads.
* | llvmpipe: asst fixes for 'make linux-llvmpipe'Brian Paul2009-09-113-0/+6
| |
* | radeon: Remove structure allocation from iterator variable.Pauli Nieminen2009-09-111-1/+1
| | | | | | | | | | dma_bo varaible is only used for iterating so allocating memory for it only causes memory leaks.
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-101-1/+3
|\|
| * softpipe: minor indentation fixBrian Paul2009-09-101-1/+1
| |
| * softpipe: set dirty_render_cache in softpipe_clear()Brian Paul2009-09-101-0/+2
| | | | | | | | | | | | | | This fixes a bug seen when doing a glDrawPixels(GL_STENCIL_INDEX) right after a glClear(). The check-for-flush test was failing because we didn't set the dirty_render_cache flag in softpipe_clear(). So we saw stale data when we mapped the stencil buffer.
* | intel: disable intel_stencil_drawpixels() for nowBrian Paul2009-09-101-0/+16
| | | | | | | | It doesn't work reliably even when all the prerequisite checks are made.
* | Fix merge failIan Romanick2009-09-101-13/+0
| | | | | | | | | | | | | | | | | | One of the conflicst from this merge was missed: commit 0c309bb494b6ee1c403442d1207743f749f95b6e Merge: c6c44bf d27d659 Author: Brian Paul <[email protected]> Date: Wed Sep 9 08:33:39 2009 -0600
* | tgsi: use new tgsi_call_record to handle execution mask stacksBrian Paul2009-09-102-14/+43
| | | | | | | | This fixes some issues when "return"ing from nested loops/conditionals.