Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into r300g-glsl | Nicolai Hähnle | 2009-10-07 | 208 | -21441/+1160 |
|\ | | | | | | | | | | | | | 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 | 10 | -43/+115 |
| |\ | |||||
| | * | 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]> | ||||
| | * | docs: fix glXQueryDrawable() bugs | Brian Paul | 2009-10-07 | 1 | -0/+1 |
| | | | |||||
| | * | mesa/xlib: fix glXQueryDrawable() bugs, see bug 24320 | Brian Paul | 2009-10-07 | 2 | -12/+28 |
| | | | |||||
| | * | gallium/xlib: fix glXQueryDrawable() bugs, see bug 24320 | Brian Paul | 2009-10-07 | 3 | -13/+34 |
| | | | |||||
| | * | progs/xdemos: test glXQueryDrawable() | Brian Paul | 2009-10-07 | 1 | -0/+15 |
| | | | |||||
| | * | progs/xdemos: fix swapped parameters to CreatePbuffer() | Brian Paul | 2009-10-07 | 1 | -1/+1 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | progs/test: Fix MSVC build. | Vinson Lee | 2009-10-07 | 1 | -1/+1 |
| | | | |||||
| | * | 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. | ||||
| | * | gallium/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. | ||||
| * | | util: do some more util_blit_pixels cases without temporaries | Keith Whitwell | 2009-10-07 | 1 | -90/+73 |
| | | | | | | | | | | | | | | | | | | When the source surface is pointing at a 2d texture with only one mipmap level, use that directly rather than creating a temporary. Probably want to cover more cases, but this is a start. | ||||
| * | | 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. | ||||
| * | | st/dri: Add missing front buffer case in dri_get_buffers(). | Michel Dänzer | 2009-10-07 | 1 | -0/+4 |
| | | | | | | | | | | | | | | | | | | This seems to help for compiz at least with some drivers. Also add an assert(0) to catch unhandled cases in the future. | ||||
| * | | i915g: Use buffer write instead of map for lit vertices | Jakob Bornecrantz | 2009-10-07 | 1 | -2/+37 |
| | | | |||||
| * | | i915g: Change order of buffer_write arguments | Jakob Bornecrantz | 2009-10-07 | 2 | -5/+5 |
| | | | | | | | | | | | | | | | | | | They now follow the pipe_buffer_write style, its the gallium driver that sets the interface not the winsys. | ||||
| * | | i915g: Disable vbuf fifo and minor commenting of vbuf code | Jakob Bornecrantz | 2009-10-07 | 1 | -11/+26 |
| | | | | | | | | | | | | | | | The vbuf fifo doesn't appear to help once the libdrm reuse flag has been set. | ||||
| * | | nv04-nv40: Fix swizzle transfers for NPOT sizes. | Younes Manton | 2009-10-06 | 1 | -113/+34 |
| | | | | | | | | | | | | | | | | | | Workarounds not necessary, SIFM can handle NPOT, we just weren't setting dst dimensions properly. SIFM can't handle odd w,h though, that still needs fixing. | ||||
| * | | progs/tests: fix MSVC build. | Vinson Lee | 2009-10-06 | 1 | -1/+1 |
| | | | |||||
| * | | progs/perf: Fix MSVC build. | Vinson Lee | 2009-10-06 | 1 | -0/+4 |
| | | | |||||
| * | | r600: r700PredictRenderSize can flush, so move index buffer setup after it | Andre Maasikas | 2009-10-06 | 1 | -1/+1 |
| | | | |||||
| * | | nv50: fix segfault when there's gaps in enabled texture units | Ben Skeggs | 2009-10-06 | 2 | -4/+10 |
| | | | | | | | | | | | | Tested with progs/demos/multiarb. | ||||
| * | | nouveau: fix buffer object leak | Ben Skeggs | 2009-10-06 | 1 | -1/+4 |
| | | | | | | | | | | | | Very apparent with resizing windows on DRI2. | ||||
| * | | i915g: Add more defines to tweek batchbuffer | Jakob Bornecrantz | 2009-10-06 | 1 | -13/+28 |
| | | | |||||
| * | | i915g: Tweek vertexbuffer size | Jakob Bornecrantz | 2009-10-06 | 1 | -4/+4 |
| | | | |||||
| * | | i965g: remove 965/brw files from XLIB_WINSYS_SOURCES | Brian Paul | 2009-10-05 | 1 | -3/+0 |
| | | | |||||
| * | | Merge branch 'mesa_7_6_branch' | Brian Paul | 2009-10-05 | 30 | -96/+127 |
| |\| | | | | | | | | | | | | | | | | 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) | ||||
| | * | Fix building of GLSL demos which use M_PI | Jon TURNEY | 2009-10-05 | 3 | -0/+9 |
| | | | | | | | | | | | | | | | | | | Some <math.h> files do not define M_PI, in which case, provide our own definition Signed-off-by: Jon TURNEY <[email protected]> | ||||
| | * | 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 | 3 | -5/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | 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]> | ||||
| | * | docs: document default texture binding fix | Brian Paul | 2009-10-02 | 1 | -0/+1 |
| | | | |||||
| | * | 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. | ||||
| | * | gallium/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. | ||||
| | * | 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. | ||||
| | * | gallium/xlib: return GLX_RGBA_BIT or GLX_COLOR_INDEX_BIT in get_config() | Brian Paul | 2009-10-02 | 1 | -2/+2 |
| | | | | | | | | | | | | This reverts part of commit a6b84aef4ad3a7bac40704146a98977c62bfb6e8 | ||||
| | * | gallium: replace // comments with /* */ | Brian Paul | 2009-10-02 | 9 | -11/+11 |
| | | | |||||
| | * | gallium: remove // comment and extra whitespace | Brian Paul | 2009-10-02 | 1 | -7/+0 |
| | | | |||||
| | * | 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 |
| | | | |||||
| | * | gallium/util: silence uninitialized var warning | Brian Paul | 2009-10-01 | 1 | -0/+1 |
| | | | |||||
| | * | mesa: add missing return when out of memory | Brian Paul | 2009-10-01 | 1 | -0/+1 |
| | | |