Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | mesa: added internal post color matrix scale/bias vars | Brian Paul | 2008-05-18 | 2 | -0/+34 |
| | | | | cherry-picked from gallium-0.1 (302daeb2ec62c59bd28d0c53cdc0fb07dc9d0f58) | ||||
* | fixes to _mesa_combine_programs(), from gallium-0.1 | Brian Paul | 2008-05-18 | 2 | -6/+46 |
| | |||||
* | added div by zero check for Fog.End/Start (from gallium-0.1) | Brian Paul | 2008-05-18 | 1 | -1/+2 |
| | |||||
* | clean-ups / additions from gallium-0.1 branch | Brian Paul | 2008-05-18 | 1 | -7/+35 |
| | |||||
* | bring in fixes/changes from gallium-0.1 | Brian Paul | 2008-05-16 | 1 | -80/+32 |
| | |||||
* | fix an attr/src mix-up when setting-up/binding vertex arrays | Brian Paul | 2008-05-16 | 2 | -2/+2 |
| | | | | | This fixes problems with incorrect material coefficients when glMaterial is called per-vertex. | ||||
* | fix merge collision | Brian Paul | 2008-05-16 | 1 | -3/+1 |
| | |||||
* | silence warning, new assertion | Brian Paul | 2008-05-16 | 1 | -3/+6 |
| | |||||
* | free(key) in _tnl_UpdateFixedFunctionProgram() | Shunichi Fuji | 2008-05-16 | 1 | -0/+3 |
| | |||||
* | Fix a program refcounting error, don't share program parameter lists. | Brian Paul | 2008-05-16 | 2 | -41/+20 |
| | | | | | | The refcounting bug was causing a memleak (unfreed programs). The old parameter list sharing is not needed since the change in how uniforms are handled. | ||||
* | minor changes to aid debugging | Brian Paul | 2008-05-16 | 1 | -7/+15 |
| | |||||
* | remove stray, left-over RefCount++ | Brian Paul | 2008-05-16 | 1 | -1/+0 |
| | |||||
* | whitespace/formatting | Brian Paul | 2008-05-16 | 1 | -2/+0 |
| | |||||
* | init SamplersUsed bits in _mesa_parse_arb_fragment_program | Brian Paul | 2008-05-16 | 1 | -1/+4 |
| | |||||
* | fix assertion typo: s/=/==/ | Brian Paul | 2008-05-16 | 1 | -1/+1 |
| | |||||
* | Fix memory leak in _tnl_UpdateFixedFunctionProgram | Shunichi Fuji | 2008-05-16 | 1 | -0/+2 |
| | |||||
* | Fix DRI build | Brian Paul | 2008-05-16 | 1 | -2/+1 |
| | |||||
* | Updated GLSL uniform/sampler handling from gallium-0.1 branch | Brian Paul | 2008-05-14 | 17 | -413/+338 |
| | | | | | | | | | | Previously, the shader linker combined the uniforms used by the vertex and fragment shaders into a combined set of uniforms. This made the implementation of glUniform*() simple, but was rather inefficient otherwise. Now each shader gets its own set of uniforms (no more modelview matrix showing up in the fragment shader uniforms, for example). cherry-picked by hand from gallium-0.1 branch | ||||
* | mesa: new functions for managing list/index of uniforms | Brian Paul | 2008-05-14 | 2 | -0/+248 |
| | | | | cherry-picked from gallium-0.1 | ||||
* | clean-up swizzle fields in fog code, fix NegateBase | Brian Paul | 2008-05-14 | 1 | -11/+10 |
| | | | | cherry-picked from gallium-0.1 | ||||
* | sync up with gallium-0.1 changes | Brian Paul | 2008-05-14 | 2 | -85/+115 |
| | | | | New _mesa_num_inst_dst_regs(), _mesa_is_tex_instruction() functions | ||||
* | added _mesa_combine_parameter_lists() | Brian Paul | 2008-05-14 | 6 | -2/+296 |
| | | | | cherry-picked from gallium-0.1 | ||||
* | mesa: added _mesa_insert_instructions() | Brian Paul | 2008-05-14 | 2 | -10/+52 |
| | | | | | | Also, use new _mesa_free_instructions() in a few places. cherry-picked from gallium-0.1 | ||||
* | mesa: added _mesa_free_instructions() | Brian Paul | 2008-05-14 | 2 | -0/+20 |
| | | | | cherry-picked from gallium-0.1 | ||||
* | fix some additional program refcounting bugs | Brian Paul | 2008-05-14 | 3 | -22/+13 |
| | |||||
* | _generic_read_RGBA_span_BGRA8888_REV_SSE2: It should adjust the source | Xiang, Haihao | 2008-05-14 | 1 | -1/+3 |
| | | | | and target pointers after do the first 2 pixels. fix bug #15850 | ||||
* | Don't link demos directly to X libraries | Dan Nicholson | 2008-05-09 | 1 | -2/+4 |
| | | | | | Since the linker will just pull in the libraries needed from libGL, we don't need to link the demos directly to the X libraries. Fixes #15886. | ||||
* | autoconf: Allow XCB to be used for GLX | Dan Nicholson | 2008-05-09 | 1 | -1/+26 |
| | | | | | Adds an --enable-xcb switch to use XCB in GLX. This only has an effect when the driver is DRI. | ||||
* | Default DRI driver directory to match X.Org xserver | Dan Nicholson | 2008-05-09 | 4 | -6/+5 |
| | | | | | | | Since the only valid consumer of the DRI drivers is the X.Org xserver, this changes the default DRI driver directory to match xorg-server: ${libdir}/dri. The old default of /usr/X11R6/modules/dri was wrong for nearly all current systems. | ||||
* | autoconf: Attempt to figure out the PIC flags for the platform | Dan Nicholson | 2008-05-09 | 3 | -17/+125 |
| | | | | | | | | | | | | | | | This commit adds an autoconf macro, MESA_PIC_FLAGS, which sets the PIC flags according to platform and static/shared setting. The platform specifics are taken straight from libtool.m4 and stripped down to just the flags and platforms we cover in Mesa. This should hopefully make it possible to use autoconf on non-GCC platforms. The macro is added external to configure.ac in acinclude.m4 since it's pretty bloated. Note to BSDers: Previously, x86 defaulted to non-PIC on FreeBSD. I didn't carry that preference into this macro. Instead, you can just use --disable-pic where desired. | ||||
* | intel: use new mipmap generation hooks in driver. | Dave Airlie | 2008-05-09 | 5 | -11/+13 |
| | |||||
* | swrast/dri: switch over users of generate_mipmap to new interface | Dave Airlie | 2008-05-09 | 3 | -9/+7 |
| | |||||
* | Revert "mesa/intel: map/unmap texture objects around mipmap generation ↵ | Dave Airlie | 2008-05-09 | 2 | -24/+0 |
| | | | | | | | | function." This reverts commit c50ffc4cb89b67ae59208eb72cdb664c846ba987. I'll fix this using the mipmap hooks I just picked from gallium-0.1 | ||||
* | Remove unused texunit parameter to ctx->Driver.GenerateMipmap() | Brian | 2008-05-09 | 5 | -29/+10 |
| | | | | (cherry picked from commit c3395f4473c8fdf75d04c0dd72e687bc8d8127a7) | ||||
* | Added ctx->Driver.GenerateMipmap() driver hook | Dave Airlie | 2008-05-09 | 4 | -25/+34 |
| | | | | | | | | (cherry picked from commit 4c2f3dbca940f289e67248682b84a3516d5a3031) Conflicts: src/mesa/drivers/common/driverfuncs.c | ||||
* | mesa/intel: map/unmap texture objects around mipmap generation function. | Dave Airlie | 2008-05-09 | 2 | -0/+24 |
| | | | | | This at least stops the compiz brain explosion we were seeing, I do wonder though if we should somehow be calling intel_generate_mipmap somehow. | ||||
* | Add RS690M PCI ID. | Kristian Høgsberg | 2008-05-08 | 1 | -0/+1 |
| | |||||
* | disable debug printfs | Brian Paul | 2008-05-08 | 1 | -2/+2 |
| | |||||
* | disable GL_DEPTH_TEST before glDrawPixels in case window has unrequested ↵ | Brian Paul | 2008-05-08 | 1 | -0/+1 |
| | | | | depth buffer | ||||
* | call glutDestroyWindow() | Brian Paul | 2008-05-08 | 1 | -2/+5 |
| | |||||
* | mesa: Call RENDER_FINISH on the zero pixel case. | Xiang, Haihao | 2008-05-08 | 1 | -1/+3 |
| | |||||
* | fix refcounting bugs in tnl/tex program caches | Brian Paul | 2008-05-07 | 5 | -62/+68 |
| | |||||
* | updated options/help | Brian Paul | 2008-05-07 | 1 | -5/+18 |
| | |||||
* | Never fail `make clean' | Dan Nicholson | 2008-05-07 | 28 | -53/+53 |
| | | | | | | Mostly some pedantic changes such that `make clean' always ignores errors. Also changed the top clean target to do the `touch configs/current' dance instead of realclean. | ||||
* | Run `make clean' in drivers/xorg, too | Dan Nicholson | 2008-05-07 | 1 | -0/+1 |
| | |||||
* | Refactor installation targets | Dan Nicholson | 2008-05-07 | 1 | -19/+26 |
| | | | | | | | | | Currently, there is a single path in src/mesa/Makefile to install that has a few conditionals in it. This commit changes install to act like default where we loop over $(DRIVER_DIRS), deciding what to do. A new target, install-headers, has been broken out to accomodate installing a standalone OSMesa where neither libGL or gl.pc are wanted. | ||||
* | Ensure recursive makes always propagate errors | Dan Nicholson | 2008-05-07 | 3 | -8/+8 |
| | | | | | There were a couple spots left where a recursive make could fail in a chain of commands without stopping. | ||||
* | implement full reference counting for vertex/fragment programs | Brian | 2008-05-06 | 8 | -66/+141 |
| | | | | | Use _mesa_reference_vert/fragprog() wherever we assign program pointers. Fixes a memory corruption bug found with glean/api2 test. | ||||
* | Update make output for autoconf help | Dan Nicholson | 2008-05-06 | 1 | -1/+5 |
| | |||||
* | Merge branch 'master' of ssh://git.freedesktop.org/git/mesa/mesa | Dan Nicholson | 2008-05-06 | 1 | -0/+33 |
|\ |