Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | r300compiler: fix scons build again | Joakim Sindholt | 2009-10-07 | 1 | -1/+8 |
| | |||||
* | Merge branch 'master' into r300g-glsl | Nicolai Hähnle | 2009-10-07 | 36 | -142/+376 |
|\ | | | | | | | | | | | | | Conflicts: src/gallium/drivers/r300/r300_tgsi_to_rc.c Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
| * | Merge branch 'mesa_7_6_branch' | Nicolai Hähnle | 2009-10-07 | 4 | -25/+58 |
| |\ | |||||
| | * | shader_api: Fix bounds checking of glUniform and glUniformMatrix | Nicolai Hähnle | 2009-10-07 | 1 | -9/+22 |
| | | | | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> Reviewed-by: Ian Romanick <[email protected]> | ||||
| | * | prog_parameter: Document the fact that Size may be > 4 | Nicolai Hähnle | 2009-10-07 | 1 | -1/+7 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
| | * | mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320 | Brian Paul | 2009-10-07 | 2 | -12/+28 |
| | | | |||||
| | * | swrast: s/GLfloat/GLuint/ in bzero() | Brian Paul | 2009-10-07 | 1 | -1/+1 |
| | | | |||||
| | * | swrast: add missing returns | Brian Paul | 2009-10-07 | 1 | -0/+2 |
| | | | |||||
| | * | mesa/xlib: return 0 for errorBase, eventBase in glXQueryExtension() | Brian Paul | 2009-10-07 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | A little better than leaving the values undefined, I think. See bug 24321. | ||||
| * | | mesa/st: add missing mesa constant file name | Keith Whitwell | 2009-10-07 | 1 | -10/+11 |
| | | | | | | | | | | | | | | | There are many different names for constants in mesa, we were missing one since the ureg rewrite. | ||||
| * | | st/mesa: pass pipe_screen, not pipe_context to st_choose_format() functions | Brian Paul | 2009-10-07 | 5 | -12/+15 |
| | | | | | | | | | | | | These don't depend on context state, but use a screen pointer. | ||||
| * | | r600: r700PredictRenderSize can flush, so move index buffer setup after it | Andre Maasikas | 2009-10-06 | 1 | -1/+1 |
| | | | |||||
| * | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-10-05 | 15 | -75/+101 |
| |\| | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_cpu_detect.c | ||||
| | * | intel: use driReadDrawable in do_copy_texsubimage() | Brian Paul | 2009-10-05 | 1 | -1/+1 |
| | | | |||||
| | * | intel: use driReadDrawable, not driDrawable in do_blit_readpixels() | Brian Paul | 2009-10-05 | 1 | -2/+2 |
| | | | |||||
| | * | intel: remove a buffer equality test in _mesa_make_current() | Brian Paul | 2009-10-05 | 1 | -33/+27 |
| | | | | | | | | | | | | | | | | | | | | | Before, if we called glXMakeCurrent() to change a context's window binding while an FBO was bound, we weren't updating the intel->driDrawable and intel->driReadDrawable fields. This could cause us to dereference a null pointer elsewhere. | ||||
| | * | mesa: fix return value when clipping {Read,Draw}Pixels height <= 0 | Brian Paul | 2009-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | Signed-off-by: Ben Skeggs <[email protected]> (cherry picked from master, commit 7aeaca33c331f70d507fc83583b13b8d9fc3e847) | ||||
| | * | Use _mesa_select_tex_image() rather than hardcoding face 0. | Michel Dänzer | 2009-10-05 | 1 | -2/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | Fixes crash loading a map in sauerbraten with hwmipmap 1 in ~/.sauerbraten/config.cfg. | ||||
| | * | r200: remove subpixel offset from viewport | Frederic Crozat | 2009-10-04 | 1 | -11/+4 |
| | | | | | | | | | | | | Fixes bug fdo 20340 for r200. | ||||
| | * | r300: Workaround problem on R500 with very large fragment programs | Nicolai Hähnle | 2009-10-03 | 2 | -5/+28 |
| | | | | | | | | | | | | | | | | | | | | | | | | The non-KMS interface is to blame here. In theory, a proper fix could be produced that works for the KMS interface only, but it require cleaning a lot of mess. Easier to just do it right in r300g. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
| | * | mesa: fix incorrect default texture binding in unbind_texobj_from_texunits() | Brian Paul | 2009-10-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | If we deleted a currently bound texture, we were always reverting the texture binding to the default 1D texture rather than the proper default texture. | ||||
| | * | xlib: use bitwise-and to test GLX_RGBA_BIT in choose_visual() | Brian Paul | 2009-10-02 | 1 | -2/+2 |
| | | | | | | | | | | | | The parameter is a bitmask. | ||||
| | * | mesa: fix memory leak when generating mipmaps for compressed textures | Brian Paul | 2009-10-01 | 1 | -6/+10 |
| | | | |||||
| | * | mesa: fix mem leaks | Brian Paul | 2009-10-01 | 1 | -0/+4 |
| | | | |||||
| | * | mesa: add missing return when out of memory | Brian Paul | 2009-10-01 | 1 | -0/+1 |
| | | | |||||
| | * | mesa: fix potential uninitialized memory reads | Brian Paul | 2009-10-01 | 1 | -0/+6 |
| | | | |||||
| | * | glsl: fix mem leak | Brian Paul | 2009-10-01 | 1 | -0/+1 |
| | | | |||||
| | * | st/mesa: check for null before asserts, fix possible mem leak | Brian Paul | 2009-10-01 | 1 | -6/+7 |
| | | | |||||
| | * | st/mesa: silence hidden parameter warning | Brian Paul | 2009-10-01 | 1 | -6/+6 |
| | | | |||||
| | * | st/mesa: fix non-mipmap lastLevel calculation. | Brian Paul | 2009-10-01 | 1 | -1/+5 |
| | | | | | | | | | | | | | | | reviewed by Brian Paul. (cherry picked from master, commit ae2daacbac7242938cffe0e2409071e030e00863) | ||||
| * | | r300g: fix scons build | Joakim Sindholt | 2009-10-05 | 1 | -0/+30 |
| | | | | | | | | | | | | | | | | | | So I didn't touch r300compiler, but r300g now compiles after having declarations and code untangled. As nha so gently points out, we shouldn't have to do this just to comply with MSVC compilers. | ||||
| * | | mesa: Copy textures' base format into wrapper renderbuffer. | José Fonseca | 2009-10-05 | 1 | -0/+1 |
| | | | | | | | | | | | | | | | Otherwise st_copy_texsubimage will fallback to software blit due to inconsistent base formats. | ||||
| * | | mesa/st: add ST_DEBUG environment variable | Keith Whitwell | 2009-10-05 | 10 | -8/+119 |
| | | | | | | | | | | | | | | | At last it's possible to turn on tgsi dumps and other debugging in the state tracker without modifying sources... | ||||
| * | | r600: update vertex program selection for draw path | Andre Maasikas | 2009-10-05 | 1 | -5/+35 |
| | | | |||||
| * | | mesa: fix return value when clipping {Read,Draw}Pixels height <= 0 | Ben Skeggs | 2009-10-05 | 1 | -2/+2 |
| | | | | | | | | | | | | Signed-off-by: Ben Skeggs <[email protected]> | ||||
| * | | intel: Suppress a compiler warning for an pointer->int cast | Chris Wilson | 2009-10-03 | 1 | -3/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | intel_pixel_read.c: In function ‘do_blit_readpixels’: intel_pixel_read.c:221: warning: cast from pointer to integer of different size Cast via an intermediate (GLintptr) instead and hope the result fits within GLuint... [It should as we simply do not support textures *that* large!] Signed-off-by: Chris Wilson <[email protected]> | ||||
| * | | intel: Assert that relocation offsets are within the target | Chris Wilson | 2009-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | This should catch the common programming error where we attempt to emit a relocation to beyond the end of the target buffer. Signed-off-by: Chris Wilson <[email protected]> | ||||
* | | | r300/compiler: Fix R300 vertex program dumps | Nicolai Hähnle | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | The source register field has 8 bits. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Fix yet another regression in register allocation | Nicolai Hähnle | 2009-10-06 | 1 | -0/+1 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Fix a really stupid logic inversion in the generic dataflow code | Nicolai Hähnle | 2009-10-06 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Fix regression in pair scheduling | Nicolai Hähnle | 2009-10-06 | 1 | -3/+25 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler Add support for more of the Sxx set instructions | Nicolai Hähnle | 2009-10-04 | 1 | -1/+61 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Emit flow control instructions and ALU result writes on R500 | Nicolai Hähnle | 2009-10-04 | 8 | -15/+183 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Refactor the radeon_pair code to support control flow ↵ | Nicolai Hähnle | 2009-10-04 | 16 | -1009/+1524 |
| | | | | | | | | | | | | | | | | | | instructions Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Refactor to allow different instruction types | Nicolai Hähnle | 2009-10-04 | 15 | -427/+433 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Introduce aluresult register for branch operation support | Nicolai Hähnle | 2009-10-04 | 7 | -15/+154 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | r300/compiler: Introduce control flow instructions and refactor dataflow | Nicolai Hähnle | 2009-10-03 | 14 | -776/+431 |
| | | | | | | | | | | | | | | | | | | Note that control flow instruction support isn't actually fully functional yet. Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
* | | | Merge branch 'master' into r300-compiler | Nicolai Hähnle | 2009-10-03 | 168 | -4187/+7453 |
|\| | | |||||
| * | | prog_parameter: Document the fact that Size may be > 4 | Nicolai Hähnle | 2009-10-03 | 1 | -1/+7 |
| | | | | | | | | | | | | Signed-off-by: Nicolai Hähnle <[email protected]> | ||||
| * | | radeon: Cope better with texture images with no miptrees. | Michel Dänzer | 2009-10-03 | 1 | -2/+7 |
| | | | | | | | | | | | | Fixes crash with compiz magnifier plugin. |