Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'mesa_7_5_branch' | Jakob Bornecrantz | 2009-06-09 | 8 | -41/+60 |
|\ | | | | | | | | | | | | | | | | | Conflicts: Makefile src/mesa/main/version.h src/mesa/shader/slang/slang_preprocess.c src/mesa/state_tracker/st_cb_bufferobjects.c | ||||
| * | mesa/st: fix tracking of mapped buffer ranges | Keith Whitwell | 2009-06-09 | 1 | -1/+1 |
| | | | | | | | | | | In st_bufferobj_map_range(), set obj->Offset consistently with its usage elsewhere. | ||||
| * | stw: ignore swapbuffer requests on singlebuffer | Keith Whitwell | 2009-06-09 | 1 | -0/+3 |
| | | | | | | | | | | | | Return TRUE in this case. Returning FALSE seems to result in mis-rendering -- possibly opengl32.dll is trying to compensate by doing a software blit?? | ||||
| * | glsl: Expand nested preprocessor macros. | Brian Paul | 2009-06-09 | 1 | -1/+14 |
| | | | | | | | | (cherry picked from master, commit ef8caec29ae73bb2bbeb48f0578d839ef29348cd) | ||||
| * | st/mesa: fix incorrect bufObj Length assignment, remove unneeded assertion | Brian Paul | 2009-06-08 | 1 | -2/+1 |
| | | |||||
| * | glsl: Fix preprocessor define argument parsing for dead sections. | Brian Paul | 2009-06-08 | 1 | -4/+4 |
| | | | | | | | | (cherry picked from master, commit 19a54d9f1055c366fd77026dd67007a8d5921f58) | ||||
| * | pipebuffer: Silence out of heap space debug print | Jakob Bornecrantz | 2009-06-08 | 1 | -1/+1 |
| | | |||||
| * | st/mesa: remove invalid assertion | Brian Paul | 2009-06-08 | 1 | -3/+0 |
| | | | | | | | | | | | | It's legal for ARB_vertex_program programs to not write to result.position. The results are undefined in that case. This assertion was causing us to abort/exit though. | ||||
| * | mesa: Use matching signedness for the counter as upper bound. | José Fonseca | 2009-06-08 | 1 | -1/+1 |
| | | |||||
| * | mesa: Allocate tokens from the heap. | José Fonseca | 2009-06-08 | 1 | -18/+22 |
| | | | | | | | | | | | | | | | | | | | | | | The recent increase ST_MAX_SHADER_TOKENS to 8K causes stack overflows on windows. Failure to allocate is not being propagated to the caller. This is not a regression since the previous _mesa_malloc result wasn't being checked as well. Unfortunately it is not easy to fix, as the callers of these functions do not have failure propagation mechanism either, and so on. So leaving a just fixme note for now. | ||||
| * | mesa: better error message for invalid texture unit index | Brian Paul | 2009-06-08 | 1 | -1/+4 |
| | | |||||
| * | mesa: bump MAX_PROGRAM_ENV_PARAMS from 128 to 256 | Brian Paul | 2009-06-08 | 1 | -2/+2 |
| | | | | | | | | Also, MAX_NV_VERTEX_PROGRAM_PARAMS should be 96, not 128 (or 256). | ||||
| * | mesa/vbo: drop all references to vbo on destroy | Keith Whitwell | 2009-06-08 | 1 | -8/+21 |
| | | | | | | | | | | | | We were adding references to the input arrays, but failing to drop them on destruction. This could lead to a 64kb buffer being leaked each context destruction. | ||||
| * | mesa: EXT_vertex_array_bgra fixes | Brian Paul | 2009-06-08 | 1 | -3/+24 |
| | | | | | | | | | | | | | | | | | | | | 1) Pass the correct format when calling update_array in _mesa_VertexAttribPointerARB. 2) glVertexAttribPointerNV accepts GL_BGRA format too. 3) raise INVALID_VALUE error when format is BGRA and normalized is false in glVertexAttribPointerARB (cherry picked from commit 4adb190a162c5ed0684a8616331344caadba4010) | ||||
| * | stw: If stfb not set don't call into mesa | Jakob Bornecrantz | 2009-06-08 | 1 | -1/+2 |
| | | |||||
| * | mesa: bump version to 7.5-rc3mesa_7_5_rc3 | Brian Paul | 2009-06-05 | 1 | -1/+1 |
| | | |||||
| * | osmesa: Allow building standalone in all three channel widths | Dan Nicholson | 2009-06-04 | 1 | -27/+9 |
| | | | | | | | | | | | | | | | | | | | | autoconf had been designating the 8 bit libOSMesa as the default standalone osmesa, but the Makefile expected it to be linked to libGL. Fix up the osmesa Makefile so that it allows any of the combinations of standalone and channel width to be built. Fixes bug #21980. (cherry picked from commit 7441dcd90b01df8351026af8bbb50e11bb86071a) | ||||
* | | glsl: Fix symbol replacement handling in preprocessor. | Michal Krol | 2009-06-10 | 1 | -13/+15 |
| | | |||||
* | | winsys/gdi: Link to ws2_32 library. | Michal Krol | 2009-06-10 | 1 | -0/+1 |
| | | |||||
* | | trace: __func__ --> __FUNCTION__. | Michal Krol | 2009-06-10 | 1 | -1/+1 |
| | | |||||
* | | i915: Add an option for testing the effect of early Z in classic mode. | Eric Anholt | 2009-06-09 | 5 | -1/+17 |
| | | | | | | | | | | | | The early Z stuff is supposed to be unsafe without some more work in the enable/disable path (in particular, how do we want to get it disabled on the way out to the X Server?), but at the moment is 6% in OA. | ||||
* | | intel: Remove an unneeded hunk that slipped in with texture tiling. | Eric Anholt | 2009-06-09 | 1 | -5/+0 |
| | | | | | | | | intel_miptree_pitch_align does this later on. | ||||
* | | intel: Base tri clearing depth on Y tiling, not IS_I965(). | Eric Anholt | 2009-06-09 | 1 | -4/+5 |
| | | | | | | | | | | Y tiling is why the 965 check was there, but I wanted to experiment with Y on pre-965 as well. | ||||
* | | intel: Fix intel_region_unmap to do unmap, not map. | Eric Anholt | 2009-06-09 | 1 | -1/+1 |
| | | | | | | | | Thanks to Shuang He for catching this. | ||||
* | | i965: added intelFlush() call in intel_get_tex_image() | Brian Paul | 2009-06-09 | 1 | -0/+6 |
| | | | | | | | | Fixes the render-to-texture test in progs/tests/getteximage.c | ||||
* | | intel: use GLboolean, not int, for compressed parameter | Brian Paul | 2009-06-09 | 1 | -8/+9 |
| | | |||||
* | | intel: make a bunch of glTexImage-related functions static | Brian Paul | 2009-06-09 | 6 | -149/+66 |
| | | |||||
* | | intel: whitespace clean-ups | Brian Paul | 2009-06-09 | 2 | -14/+5 |
| | | |||||
* | | vbo: more glDrawElements debug code (disabled) | Brian Paul | 2009-06-09 | 1 | -3/+74 |
| | | |||||
* | | mesa: added a simple bounds checker to glMap/UnmapBuffer() (disabled) | Brian Paul | 2009-06-09 | 1 | -0/+35 |
| | | |||||
* | | trace/rbug: Add support for draw block rule | Jakob Bornecrantz | 2009-06-09 | 3 | -3/+91 |
| | | |||||
* | | rbug: Change block protocol around a bit | Jakob Bornecrantz | 2009-06-09 | 4 | -217/+45 |
| | | |||||
* | | trace/rbug: Return textures currently bound to context | Jakob Bornecrantz | 2009-06-09 | 3 | -3/+17 |
| | | |||||
* | | rbug: Extend context info and block ops | Jakob Bornecrantz | 2009-06-09 | 4 | -0/+293 |
| | | |||||
* | | intel: remove extra \n from warning string | Brian Paul | 2009-06-09 | 1 | -1/+1 |
| | | |||||
* | | mesa: reorder fields, update comments for gl_buffer_object | Brian Paul | 2009-06-09 | 1 | -8/+11 |
| | | |||||
* | | glsl: Expand nested preprocessor macros. | Michal Krol | 2009-06-09 | 1 | -1/+14 |
| | | |||||
* | | r300-gallium: HW TCL glxgears. (Read the rest of the log.) | Corbin Simpson | 2009-06-08 | 1 | -0/+5 |
| | | | | | | | | | | | | | | | | | | | | | | Um. So, yeah. Two massive WTF moments here. The first one is that, somehow, I never actually hooked up vertex shader emission, so the only time that the VAP gets set up is during surface_copy/surface_fill. That's why acidgears was happening. The second one is that, somehow, once I actually hooked it up, glxgears just magically worked. Without any actual, real testing, I somehow accidentally made the shader compiler work. Go figure. | ||||
* | | r300-gallium: Make UCP and clip work again for SW TCL. | Corbin Simpson | 2009-06-08 | 2 | -19/+21 |
| | | | | | | | | | | | | | | SW TCL: tri-clip works, tri-userclip works HW TCL: tri-clip fails, tri-userclip works That is a 200% improvement over the previous situation. Woot. | ||||
* | | r300-gallium: Don't emit UCP planes for SW TCL. | Corbin Simpson | 2009-06-08 | 3 | -4/+12 |
| | | |||||
* | | glsl: Fix preprocessor define argument parsing for dead sections. | Michal Krol | 2009-06-08 | 1 | -4/+4 |
| | | |||||
* | | glsl: preprocessor debug code (disabled) | Brian Paul | 2009-06-08 | 1 | -0/+5 |
| | | |||||
* | | softpipe: advertise PIPE_CAP_MAX_TEXTURE_ANISOTROPY as 16.0 | Brian Paul | 2009-06-08 | 1 | -1/+1 |
| | | | | | | | | | | Note that this doesn't have any real significance since PIPE_CAP_ANISOTROPIC_FILTER still returns 0. | ||||
* | | mesa: new MESA_EXTENSION_OVERRIDE env var | Brian Paul | 2009-06-08 | 1 | -11/+101 |
| | | | | | | | | | | | | | | | | | | | | Can be used to enable/disable extensions as reported by glGetString(GL_EXTENSIONS). If a name is preceeded by '-' it's disabled. Otherwise, the named extension is enabled. Intended for debug/test purposes. | ||||
* | | mesa: EXT_vertex_array_bgra fixes | Maciej Cencora | 2009-06-08 | 1 | -3/+24 |
| | | | | | | | | | | | | | | | | 1) Pass the correct format when calling update_array in _mesa_VertexAttribPointerARB. 2) glVertexAttribPointerNV accepts GL_BGRA format too. 3) raise INVALID_VALUE error when format is BGRA and normalized is false in glVertexAttribPointerARB | ||||
* | | trace/rbug: Sleep on windows when blocked | Jakob Bornecrantz | 2009-06-08 | 1 | -1/+3 |
| | | |||||
* | | llvm: fix compile on gcc 4.4 | Dave Airlie | 2009-06-08 | 1 | -0/+2 |
| | | |||||
* | | nouveau: forgotten makefile... | Ben Skeggs | 2009-06-07 | 1 | -0/+8 |
| | | |||||
* | | nv50: fix multi-texturing | Ben Skeggs | 2009-06-06 | 3 | -5/+16 |
| | | |||||
* | | nv50: support non-normalized texture coords | Ben Skeggs | 2009-06-06 | 4 | -8/+18 |
| | |