summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'mesa_7_6_branch'Brian Paul2009-09-0918-26/+63
|\
| * 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)
| | * intel: Move intel_pixel_read.c to shared for use with i965.Eric Anholt2009-09-042-306/+307
| | | | | | | | | | | | (cherry picked from commit dcfe0d66bfff9a55741aee298b7ffb051a48f0d3)
| | * i965: Add missing state dependency of sf_unit on _NEW_BUFFERS.Eric Anholt2009-09-041-2/+4
| | | | | | | | | | | | (cherry picked from commit 99174e7630676307f618c252755a20ba61ad9158)
| | * intel: Align cubemap texture height to its padding requirements.Eric Anholt2009-09-041-0/+10
| | | | | | | | | | | | | | | (cherry picked from commit a70e1315846cd5e8d6f2b622821ff8262fe7179d) (cherry picked from commit 29e51c3872531366570d032147abad50f8a3c1af)
| | * intel: Align untiled region height to 2 according to 965 docs.Eric Anholt2009-09-041-0/+7
| | | | | | | | | | | | | | | | | | This may or may not be required pre-965, but it doesn't seem unlikely, and I'd rather be safe. (cherry picked from commit b053474378633249be0e9f24010650ffb816229a)
| | * i965: Fix source depth reg setting for FSes reading and writing to depth.Eric Anholt2009-09-043-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | For some IZ setups, we'd forget to account for the source depth register being present, so we'd both read the wrong reg, and write output depth to the wrong reg. Bug #22603. (cherry picked from commit f44916414ecd2b888c8a680d56b7467ccdff6886)
| | * i965: Respect CondSwizzle in OPCODE_IF.Eric Anholt2009-09-041-1/+21
| | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes piglit glsl-vs-if-bool and progs/glsl/twoside, and will likely be useful for the looping code. Bug #18992 (cherry picked from commit 78c022acd0b37bf8b32f04313d76255255e769c1) (cherry picked from commit 63d7a2f53fb38e170f4e55f2b599e918edf2c512)
| | * i965: asst clean-ups, etc in brw_vs_emit()Brian Paul2009-09-041-11/+10
| | | | | | | | | | | | (cherry picked from commit fd7d764514c540987549c3ea88a2d669b0f0ea58)
| | * i965: Emit conditional code updates as required for GLSL VS if statements.Eric Anholt2009-09-041-0/+13
| | | | | | | | | | | | | | | | | | Previously, we'd be branching based on whatever condition code happened to be laying around. (cherry picked from commit 7007f8b352763af89805f287153cb7972bff0523)
| | * i965: Spell "conditional" correctly.Eric Anholt2009-09-043-15/+15
| | |
| | * i965: Fix RECT shadow sampling by not losing the other texcoords.Eric Anholt2009-09-041-1/+5
| | | | | | | | | | | | | | | Bug #20821 (cherry picked from commit 191e028de20b2f954621b652aa77b06d0e93652a)
| | * i965: Assert that the offset in the VBO is below the VBO size.Eric Anholt2009-09-041-0/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This avoids sending a bad buffer address to the GPU due to programmer error, and is permitted by the ARB_vbo spec. Note that we still have the opportunity to dereference past the end of the GPU, because we aren't clipping to a correct _MaxElement, but that appears to be harder than it should be. This gets us the 90% solution. Bug #19911. (cherry picked from commit d7430d942f6c7950a92367aeb13b80cf76ccad78)
| | * i965: Even if no VS inputs are set, still load some amount of URB as required.Eric Anholt2009-09-041-0/+11
| | | | | | | | | | | | | | | | | | | | | See comment on Vertex URB Entry Read Length for VS_STATE. This, combined with the previous three commits, fixes #22945. (cherry picked from commit e340d4f9866db4bae391288e83a630a310b0dd2b)
| | * i965: Make sure the VS URB size is big enough to fit a VF VUE.Eric Anholt2009-09-041-1/+8
| | | | | | | | | | | | | | | | | | | | | This fix is just from code and docs inspection, but it may fix hangs on some applications. (cherry picked from commit e93848e595176ae0bad3bfe64e0ca63fd089bb72)
| | * i965: Don't emit bad packets when no VBs are referenced.Eric Anholt2009-09-041-0/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | It appears that sometimes Mesa (and I suppose a VS could as well) emits a program which references no vertex data, and thus we end up with nr_enabled == 0 even though some VBs are enabled. We'd end up emitting VB/VE packet headers of 0xffffffff in that case, leading to GPU hangs. Bug #22945 (wine with an uncompiled VS) (cherry picked from commit d1fbfd0f962347e4153db3852292d44de5aea863)
| | * i965: Calculate enabled[] and nr_enabled once and re-use the values.Eric Anholt2009-09-042-29/+18
| | | | | | | | | | | | | | | The code duplication bothered me. (cherry picked from commit 9b9cb30d128fc5f1ba77287696ecd508e640efde)
| | * i965: Set the max index buffer address correctly according to the docs.Eric Anholt2009-09-041-1/+1
| | | | | | | | | | | | | | | It's the last addressable byte, not the byte after the end of the buffer. (cherry picked from commit b72dea5441e8e9226dabf1826fa3bc129c7bc281)
| | * i965: rename var: s/tmp/vs_inputs/Brian Paul2009-09-041-8/+8
| | | | | | | | | | | | (cherry picked from commit 840c09fc71542fdfc71edd2a2802925d467567bb)
| | * docs: 7.5.1 md5 sumsBrian Paul2009-09-031-1/+9
| | |
| | * docs: point to fd.o for downloads instead of SourceForgemesa_7_5_1Brian Paul2009-09-031-5/+5
| | |
| | * gallium/xlib: silence unitialized var warningBrian Paul2009-09-031-1/+1
| | |
| | * gallium/xlib: silence uninitialized var warningBrian Paul2009-09-031-1/+1
| | |
| | * st/mesa: silence uninitialized var warningsBrian Paul2009-09-031-2/+2
| | |
| | * docs: prep for 7.5.1 releaseBrian Paul2009-09-031-5/+2
| | |
| | * docs: added news entry for 7.5.1Brian Paul2009-09-031-0/+7
| | |
| | * docs: update precompiled libs infoBrian Paul2009-09-031-9/+3
| | |
| | * docs: move SGI GLU linkBrian Paul2009-09-031-1/+1
| | |
| | * st/mesa: fix glCopyPixels(GL_STENCIL_INDEX) inverted positionBrian Paul2009-09-031-0/+4
| | | | | | | | | | | | | | | If the renderbuffer orientation is Y=0=TOP we need to invert the dstY position.
| | * st/mesa: Do GL_RGBA->GL_RGB texsubimage on hardwareKeith Whitwell2009-09-021-14/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | State tracker currently backs GL_RGB textures with RGBA almost always. This means we need to maintain A==1 in these textures to give correct GL_RGB sampling results. This change offloads the RGBA->RGB copy to hardware using the new writemask version of u_blit_pixels. More src/dstLogical/dstActual triples could be shifted to hardware by this technique in future patches.
| | * util: add version of u_blit_pixels which takes a writemaskKeith Whitwell2009-09-024-15/+100
| | | | | | | | | | | | Values outside the writemask are set in the destination to {0,0,0,1}
| | * draw: remove unused variableKeith Whitwell2009-09-021-1/+0
| | |
| | * progs/tests: re-enable exit() callBrian Paul2009-09-011-1/+1
| | | | | | | | | | | | See bug 21267.
| | * swrast: fix selection/feedback regressionBrian Paul2009-08-311-1/+1
| | | | | | | | | | | | | | | This fixes a conform selection/feedback regression introduced by commit 8f4d66c5f893b49eb3973aa3b31a856314c045c7
| | * swrast: can't use deferred texture/shading if using KIL instructionBrian Paul2009-08-311-0/+3
| | | | | | | | | | | | | | | | | | If the fragment program uses KIL, we have to execute it before z/stencil testing. Otherwise, deferred texture/shading lets us skip shading for pixels that fail z/stencil testing.
| | * mesa: added const qualifiers, move local varBrian Paul2009-08-311-7/+8
| | |
| | * mesa: fix saturation logic in emit_texenv()Brian Paul2009-08-311-1/+7
| | | | | | | | | | | | | | | | | | We need to clamp/saturate after each texenv stage, not just the last one. Fixes glean texEnv failure for softpipe (and probably other fragment program- based drivers).
| | * docs: fixed glXCreateGLXPixmap() for direct renderingBrian Paul2009-08-311-0/+1
| | |
| | * docs/: document cross-compile fixBrian Paul2009-08-311-0/+1
| | |
| | * mesa: fix 32bit cross compilation on a 64bit machineMarc Dietrich2009-08-312-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When cross compiling on a 64bit machine, gen_matypes.c is build for the host machine (64bit) but must generates code for the target machine (32bit). This causes wrong offsets all over the place and crashes googleearth on my machine. Solution is to add -m32 when cross compiling. Attached patch is compatible with linux-x86-32 and autoconf based builds.
| * | gallium: Added HaikuOS platformaljen2009-09-099-19/+31
| | |
| * | mesa: disable GL_LUMINANCE case in _mesa_meta_draw_pixels()Brian Paul2009-09-091-1/+4
| | | | | | | | | | | | Works around a bug found on i965. See bug 23670.