summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-163-0/+669
|\ | | | | | | | | 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.
| * docs: glUniform functions are now compiled into display listsBrian Paul2009-09-151-0/+1
| |
| * 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
| |
| * docs: document glUseProgram display list fixBrian Paul2009-09-151-0/+1
| |
| * 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-157-4/+56
|\|
| * progs/vp: print program and error info when program does not compileBrian Paul2009-09-141-0/+6
| |
| * glsl: added some link debug code (disabled)Brian Paul2009-09-141-0/+15
| |
| * docs: document linker/preprocessor bug fixBrian Paul2009-09-141-0/+2
| |
| * 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.
| * configure: fix commentThierry Vignaud2009-09-141-1/+1
| |
| * Use CFLAGS as HOST_CFLAGS by defaultDan Nicholson2009-09-121-0/+1
| | | | | | | | | | | | | | | | Unless we're cross compiling, the HOST_CFLAGS should be the same as the normal CFLAGS. This allows the x86 and x86_64 asm to be built correctly with a native compiler using -m32/-m64. Signed-off-by: Dan Nicholson <[email protected]>
| * mesa: raise GL_INVALID_ENUM not GL_INVALID_VALUE for glTexParamter errorsVinson Lee2009-09-111-3/+3
| | | | | | | | Signed-off-by: Brian Paul <[email protected]>
* | gl: restore some PFNGL typedefsBrian Paul2009-09-151-0/+15
| | | | | | | | | | | | | | Commit d33c315d9e32584dea12cea683795b498a9f5eca removed a few too many typedefs. We need the typedefs in glext.h which are protected by #ifdef GL_VERSION_1_2 but we can exclude the ones protected by GL_VERSION_1_2_DEPRECATED.
* | gallium: Add Mac OS to pipe/p_thread.h.Vinson Lee2009-09-141-5/+5
| | | | | | | | Mac OS also has POSIX threads.
* | docs: mention the new Gallium llvmpipe driverBrian Paul2009-09-111-0/+4
| |
* | 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-103-1/+56
|\|
| * docs: document Gallium glDrawPixels(GL_STENCIL_INDEX) fixBrian Paul2009-09-101-0/+1
| |
| * 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.
| * docs: initial 7.5.2 release notes pageBrian Paul2009-09-102-0/+52
| |
* | 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.
* | mesa: need to set all stencil bits to 0 before setting the 1 bitsBrian Paul2009-09-101-0/+9
| | | | | | | | Plus, check for pixel transfer stencil index/offset.
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchIan Romanick2009-09-102-1/+6
|\| | | | | | | | | Conflicts: src/mesa/drivers/dri/intel/intel_context.c
| * intel: add B43 chipset supportZhenyu Wang2009-09-102-1/+6
| | | | | | | | | | | | | | | | | | Signed-off-by: Zhenyu Wang <[email protected]> Signed-off-by: Ian Romanick <[email protected]> Hopefully this will be one of the last cherry-picks. (cherry picked from commit ca246dd186f9590f6d67038832faceb522138c20)
* | i965: Fix relocation delta for WM surfaces.Eric Anholt2009-09-101-1/+1
| | | | | | | | | | | | | | | | This was a regression in 0f328c90dbc893e15005f2ab441d309c1c176245. Bug #23688 Bug #23254 (cherry picked from commit 5604b27b9326ac542069a49ed9650c4b0d3e939a)
* | mesa: in texenvprogram code, only do saturation when really needed.Brian Paul2009-09-101-8/+53
| | | | | | | | | | For some env modes (like modulate or replace) we don't have to clamp because we know the results will be in [0,1].
* | gallium: Add PIPE_OS_APPLE back to auxiliary/util/u_time.h.Vinson Lee2009-09-101-1/+1
| | | | | | | | Fixes typo from commit c6c44bf48124dd5b4661014a8d58482c5a54557f.
* | radeon: Change debugging code to use macros instead of inline functions.Pauli Nieminen2009-09-102-43/+27
| | | | | | | | | | | | Variadic functions can't be inlined which makes debugging to have quite large function overead. Only aleternative method is to use variadic macros which are inlined so compiler can optimize debugging to minimize overhead.
* | mesa: include new u_format.csv file in tarballsBrian Paul2009-09-091-0/+1
| |
* | radeon: Add more verbose error message for failed command buffer.Pauli Nieminen2009-09-091-1/+3
| |
* | Merge branch 'mesa_7_5_branch' into mesa_7_6_branchBrian Paul2009-09-098-6/+28
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile configs/default progs/glsl/Makefile src/gallium/auxiliary/util/u_simple_shaders.c src/gallium/state_trackers/glx/xlib/xm_api.c src/mesa/drivers/dri/i965/brw_draw_upload.c src/mesa/drivers/dri/i965/brw_vs_emit.c src/mesa/drivers/dri/intel/intel_context.h src/mesa/drivers/dri/intel/intel_pixel.c src/mesa/drivers/dri/intel/intel_pixel_read.c src/mesa/main/texenvprogram.c src/mesa/main/version.h
| * scons: Set default_dri to no for Mac OS.Vinson Lee2009-09-091-2/+2
| | | | | | | | Mac OS does not have libdrm.
| * mesa: bump version to 7.5.2Brian Paul2009-09-083-5/+5
| | | | | | | | I'm not 100% sure there'll be a 7.5.2 release, but just in case.
| * i965: fix incorrect test for vertex position attributeBrian Paul2009-09-083-1/+4
| |
| * egl: also use X types for building on Apple/MacOS XBrian Paul2009-09-081-1/+2
| | | | | | | | See bug 20413.
| * prog/glsl: fix Makefile for samplers_array.Peter Hutterer2009-09-071-1/+1
| | | | | | | | | | | | | | | | | | | | | | The rule added in 488b3c4d1bc3d830477180759a42dbaf8f5801b0 does not use the right INCDIR, breaking the build when GL isn't installed in the default include paths. 7.5 branch only fix, already fixed in master by rewriting the Makefile (ceb9459ed5e63207defa5d715958c2757933272f) Signed-off-by: Peter Hutterer <[email protected]>
| * i965: Fix warnings in intel_pixel_read.c.Eric Anholt2009-09-041-0/+4
| | | | | | | | (cherry picked from commit c80ce5ac90b1e0ac7a72cd41c314aa2000bfecf5)
| * intel: Also get the DRI2 front buffer when doing front buffer reading.Eric Anholt2009-09-044-1/+29
| | | | | | | | (cherry picked from commit df70d3049a396af3601d2a1747770635a74120bb)
| * intel: Update Mesa state before span setup in glReadPixels.Eric Anholt2009-09-043-3/+13
| | | | | | | | | | | | We could have mapped the wrong set of draw buffers. Noticed while looking into a DRI2 glean ReadPixels issue. (cherry picked from commit afc981ee46791838f3cb83e11eb33938aa3efc83)