Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'origin/master' into radeon-rewrite | Dave Airlie | 2009-02-13 | 1408 | -20026/+281519 |
|\ | | | | | | | | | | | | | Conflicts: configure.ac src/mesa/drivers/dri/r200/r200_context.c src/mesa/drivers/dri/r300/r300_render.c | ||||
| * | Fix an i965 assertion failure on glClear() | Robert Ellison | 2009-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | While running conform with render-to-texture: conform -d 33 -v 2 -t -direct the i965 driver failed this assertion: intel_clear.c:77: intel_clear_tris: Assertion `(mask & ~((1 << BUFFER_BACK_LEFT) | (1 << BUFFER_FRONT_LEFT) | (1 << BUFFER_DEPTH) | (1 << BUFFER_STENCIL))) == 0' failed. The problem is that intel_clear_tris() is called by intelClear() to clear any and all of the available color buffers, but intel_clear_tris() actually only handles the back left and front left color buffers; so the assertion fails as soon as you try to clear a non-standard color buffer. The fix is to have intelClear() only call intel_clear_tris() with buffers that intel_clear_tris() can support. intelClear() already backs down to _swrast_Clear() for all buffers that aren't handled explicitly. | ||||
| * | gallium: const-correctness for u_linear.c functions | Brian Paul | 2009-02-11 | 2 | -7/+8 |
| | | |||||
| * | gallium: silence warnings about void ptr arithmetic | Brian Paul | 2009-02-11 | 1 | -5/+6 |
| | | |||||
| * | mesa: refactor MATH_SOURCES, remove Mesa x86 codegen from gallium build | Brian Paul | 2009-02-11 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | Omit math/m_xform.c from gallium builds since it's not used and it's the one place we were pulling in the Mesa x86 codegen which collides with gallium's x86 codegen. Can now omit ASM_C_SOURCES from gallium build too. | ||||
| * | mesa: get rid of _math_init() | Brian Paul | 2009-02-11 | 5 | -17/+8 |
| | | | | | | | | | | | | | | | | | | | | | | Only VBO uses the evaluator code so call _math_init_eval() there. Only TNL uses the transform/translate code so call _math_init_transformation() and _math_init_translate9) there. This is a step toward resolving some symbol collisions between Mesa's and gallium's x86 codegen. Have VBO and TNL modules call _math_init_transformation() | ||||
| * | Add external pixman CFLAGS after all internal include paths | Dan Nicholson | 2009-02-11 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | With the pixman CFLAGS at the beginning of the command line, my build was picking up the glcore.h from glproto, which doesn't have any of the TFP fields in __GLcontextmodes. Signed-off-by: Dan Nicholson <[email protected]> | ||||
| * | nouveau: 1xN, Nx1 levels of a swizzled mip tree shouldn't be aligned. | Younes Manton | 2009-02-11 | 2 | -2/+4 |
| | | |||||
| * | draw: Cap max vertices instead of failing assert. | José Fonseca | 2009-02-11 | 1 | -2/+3 |
| | | |||||
| * | glsl: allow setting arrays of samplers in set_program_uniform() | Brian Paul | 2009-02-11 | 1 | -10/+19 |
| | | | | | | | | | | | | | | Arrays of sampler vars haven't been tested much and might actually be broken. Will need to be revisited someday. Another fix for bug 20056. | ||||
| * | glsl: raise GL_INVALID_OPERATION for glUniform(location < -1) | Brian Paul | 2009-02-11 | 1 | -0/+10 |
| | | | | | | | | | | | | | | location = -1 is silently ignored, but other negative values should raise an error. Another fix for bug 20056. | ||||
| * | glsl: rework _mesa_get_uniform[fi]v() to avoid using a fixed size ↵ | Brian Paul | 2009-02-11 | 1 | -44/+59 |
| | | | | | | | | intermediate array | ||||
| * | glsl: fix glUniform() array bounds error checking | Brian Paul | 2009-02-11 | 1 | -9/+21 |
| | | | | | | | | | | | | | | If too many array elements are specified, they're to be silently ignored (don't raise a GL error). Fixes another issue in bug 20056. | ||||
| * | glsl: fix incorrect size returned by glGetActiveUniform() for array elements. | Brian Paul | 2009-02-11 | 1 | -8/+25 |
| | | | | | | | | Fixes one of the issues in bug 20056. | ||||
| * | Add install target for egl | Johannes Engel | 2009-02-11 | 7 | -2/+25 |
| | | | | | | | | | | Signed-off-by: Johannes Engel <[email protected]> Acked-by: Jakob Bornecrantz <[email protected]> | ||||
| * | mesa: Use the stdio wrappers. | José Fonseca | 2009-02-11 | 1 | -22/+22 |
| | | | | | | | | snprint symbol does not exist in Windows. | ||||
| * | wgl: Add a few more stubs. | José Fonseca | 2009-02-11 | 1 | -0/+5 |
| | | | | | | | | | | I wonder why we need this... It is only necessary for the MSVC build. MinGW does not require them. | ||||
| * | mesa: Move statements after declarations. | José Fonseca | 2009-02-11 | 1 | -1/+1 |
| | | |||||
| * | intel: Add x8r8g8b8 visuals to DRI1 fbconfigs alongside a8r8gb8. | Eric Anholt | 2009-02-10 | 5 | -42/+54 |
| | | | | | | | | | | This involved fixing driConcatConfigs to not return const (which had made a mess of a previous patch too). | ||||
| * | sis: fix signedness warnings | Eric Anholt | 2009-02-10 | 2 | -5/+5 |
| | | |||||
| * | trident: Fix signedness warning. | Eric Anholt | 2009-02-10 | 1 | -1/+1 |
| | | |||||
| * | tdfx: Fix begin/endquery for current API. | Eric Anholt | 2009-02-10 | 1 | -4/+4 |
| | | |||||
| * | intel: Don't do the extra MI_FLUSH in flushing except when doing glFlush(). | Eric Anholt | 2009-02-10 | 1 | -5/+17 |
| | | | | | | | | | | Everything other than "make sure the last rendering ends up visible on the screen" doesn't need that behavior. | ||||
| * | intel: Speed up glDrawPixels(GL_ALPHA) by using an alpha texture format. | Eric Anholt | 2009-02-10 | 1 | -5/+6 |
| | | |||||
| * | intel: Fix some state leakage of {Client,}ActiveTexture in metaops. | Eric Anholt | 2009-02-10 | 2 | -0/+10 |
| | | | | | | | | Found while debugging cairo-gl. | ||||
| * | intel: don't crash when dri2 tells us about buffers we don't care about. | Eric Anholt | 2009-02-10 | 1 | -0/+3 |
| | | |||||
| * | dri2: Don't crash if the server returns more buffers than expected. | Eric Anholt | 2009-02-10 | 1 | -1/+1 |
| | | |||||
| * | dri2: Initialize variables for the getbuffers round-trip reduction. | Eric Anholt | 2009-02-10 | 1 | -0/+2 |
| | | | | | | | | Missed setting the initial values which usually didn't hurt at runtime. | ||||
| * | Merge commit 'origin/gallium-master-merge' | Brian Paul | 2009-02-10 | 1108 | -2766/+257013 |
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is the big merge of the gallium-0.2 branch into master. gallium-master-merge was just the staging area for it. Both gallium-0.2 and gallium-master-merge are considered closed now. Conflicts: progs/demos/Makefile src/mesa/main/state.c src/mesa/main/texenvprogram.c | ||||
| | * | Merge commit 'origin/gallium-0.2' into gallium-master-merge | Brian Paul | 2009-02-10 | 38 | -523/+671 |
| | |\ | |||||
| | | * | nouveau: nv40 swizzled mipmap fixes. | Younes Manton | 2009-02-10 | 3 | -13/+31 |
| | | | | |||||
| | | * | nouveau: nv30: fix miptree organization to have swizzled texture+mipmap at ↵ | Patrice Mandin | 2009-02-10 | 2 | -13/+30 |
| | | | | | | | | | | | | | | | | the right places | ||||
| | | * | nouveau: revert all my changes here, not the right way | Patrice Mandin | 2009-02-10 | 1 | -22/+9 |
| | | | | |||||
| | | * | nouveau: stop with 0 dimension | Patrice Mandin | 2009-02-10 | 1 | -1/+1 |
| | | | | |||||
| | | * | nouveau: we already have the right src offset | Patrice Mandin | 2009-02-10 | 1 | -3/+2 |
| | | | | |||||
| | | * | nouveau: do not forget to half dimension. | Patrice Mandin | 2009-02-10 | 1 | -3/+7 |
| | | | | |||||
| | | * | nouveau: revert most parts of recent mipmap+swizzle stuff. We only need to ↵ | Patrice Mandin | 2009-02-10 | 1 | -50/+43 |
| | | | | | | | | | | | | | | | | find right src and dst offset for given mipmap level. | ||||
| | | * | wgl: return before locking if stw_icd is NULL | Keith Whitwell | 2009-02-10 | 1 | -2/+17 |
| | | | | |||||
| | | * | Merge commit 'origin/gallium-0.2' into gallium-0.2 | Keith Whitwell | 2009-02-10 | 102 | -526/+8510 |
| | | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/state_trackers/wgl/icd/stw_icd.c | ||||
| | | | * | nouveau: dst offset is correct | Patrice Mandin | 2009-02-10 | 1 | -4/+2 |
| | | | | | |||||
| | | | * | pipebuffer: Drop reliance on pipe_winsys. | José Fonseca | 2009-02-10 | 4 | -24/+54 |
| | | | | | |||||
| | | | * | Missing: tgsi: Fix build -- rename Size to NrTokens. | Patrice Mandin | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | nouveau: recalc sub width and height for each mipmap level | Patrice Mandin | 2009-02-10 | 1 | -16/+23 |
| | | | | | |||||
| | | | * | nv40: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | nv30: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | nv20: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | brw: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | i915: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -1/+1 |
| | | | | | |||||
| | | | * | gallivm: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 1 | -2/+2 |
| | | | | | |||||
| | | | * | draw: Fix build -- rename Size to NrTokens. | Michal Krol | 2009-02-10 | 2 | -2/+2 |
| | | | | |