summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Revert "fix scons build"George Sapountzis2010-03-211-1/+0
| | | | This reverts commit 29ec05164838f13d9535271796a50fa213d07912.
* fix scons buildGeorge Sapountzis2010-03-211-0/+1
|
* Merge branch 'master' of git+ssh://git.freedesktop.org/git/mesa/mesaGeorge Sapountzis2010-03-211-1/+1
|\
| * nv50: report driver as GLSL capableChristoph Bumiller2010-03-211-1/+1
| | | | | | | | | | | | There's still no hint of optimization in the shaders, but we support conditionals, loops and even integer opcodes so it isn't that big a lie.
* | Revert "Makefile.template: respect LIBRARY_DEFINES in mkdep"George Sapountzis2010-03-211-1/+1
|/ | | | This reverts commit 9ec29e31919e85f9230867f43841c0e74be930d3.
* Merge branch 'master' of git://anongit.freedesktop.org/git/mesa/mesaGeorge Sapountzis2010-03-214-140/+146
|\
| * nv50: don't validate arrays on clearChristoph Bumiller2010-03-211-0/+4
| | | | | | | | The vertex elements and buffers might not be valid anymore.
| * nv50: get rid of the static_init stateobjChristoph Bumiller2010-03-213-140/+142
| | | | | | | | | | | | | | | | | | Relocations of per-screen buffers are now emitted directly, and include the necessary method to get changes in constbuf addresses committed to the hw. It should also be a bit cheaper than the way stateobjs emit relocation markers, use a little less pushbuf space.
* | drm/sw: just s/softpipe_create_screen/gallium_soft_create_screen/George Sapountzis2010-03-211-26/+4
|/ | | | This partially reverts commit f87a5f6499f51f651c2a9f2d4682875b22926905.
* gallium: add soft screen helperGeorge Sapountzis2010-03-218-37/+120
|
* dri1_api: need not include drm.hGeorge Sapountzis2010-03-211-1/+1
|
* drm/sw: does not need sw_winsysGeorge Sapountzis2010-03-211-1/+0
|
* drm/sw: llvmpipe texture_from_handleGeorge Sapountzis2010-03-211-0/+1
| | | | Not sure, but judging by softpipe, this hook was forgotten.
* Makefile.template: respect LIBRARY_DEFINES in mkdepGeorge Sapountzis2010-03-211-1/+1
|
* rename dri_sw to drisw_util for consistencyGeorge Sapountzis2010-03-214-4/+4
|
* dri_inteface: add define for checking presence of drm.hGeorge Sapountzis2010-03-212-1/+9
| | | | | | | __NOT_HAVE_DRM_H is a like a feature, defined by default on specific platforms and allows to be defined externally as well. __NOT_HAVE_DRM_H should only be used by xserver and mesa swrast_dri drivers
* glx: minor cosmeticGeorge Sapountzis2010-03-211-5/+8
|
* glx: swapBuffers prototype has changedGeorge Sapountzis2010-03-211-2/+9
|
* dri/nouveau: Reemit the light model state when lighting goes on/off.Francisco Jerez2010-03-211-0/+1
|
* dri/nouveau: Random cleanups.Francisco Jerez2010-03-219-109/+48
|
* r300g: fix occlusion query hangs.Dave Airlie2010-03-212-3/+5
| | | | | | | | | | Okay need to revist the whole OQ stuff anyways, glean test asserts which is never good. I'm liking the cached bufmgr restrictions less and less, I think I'll probably play with the fence and/or busy stuff ASAP and try and clean it up. Signed-off-by: Dave Airlie <airlied@redhat.com>
* r300g: add bufmgr cached for vertex/index buffers.Dave Airlie2010-03-213-4/+18
| | | | | | | This adds the cached bufmgr for vertex/index buffers on top of the kernel manager. Signed-off-by: Dave Airlie <airlied@redhat.com>
* gallium: cached bufmgr add map busy checkDave Airlie2010-03-211-0/+9
| | | | | | | | | | Suggested by Jose on the list, probably not perfect but will let me get past this for now, testing with a fenced bufmgr on top of this, was slower, Also this doesn't let you do the busy early exit optimisation either from what I can see. Signed-off-by: Dave Airlie <airlied@redhat.com>
* Merge remote branch 'origin/gallium-st-api-dri'Chia-I Wu2010-03-2114-905/+1346
|\
| * st/dri: fix bug in make_currentGeorge Sapountzis2010-03-201-1/+1
| |
| * st/dri: fix bug in allocate_texturesGeorge Sapountzis2010-03-201-1/+1
| |
| * st/mesa: Set the pipe context of the texture object.Chia-I Wu2010-03-181-0/+1
| | | | | | | | | | The field was added in b8030c6561e019e079b5be2fe64ec804df4bfa03. This fixes a NULL dereference in xdemos/texture_from_pixmap.
| * st/dri: Switch from st_public.h to st_api.h.Chia-I Wu2010-03-1810-558/+393
| | | | | | | | | | This is tested with demos found in progs/demos. However, only the DRI2 path is tested.
| * st/dri: Implement st_api.h callbacks.Chia-I Wu2010-03-185-0/+505
| | | | | | | | | | This commit adds dri_st_api.c that implements st_api.h callbacks. A following commit will switch st/dri from st_public.h to st_api.h.
| * st/dri: Headers and public symbols clean up.Chia-I Wu2010-03-185-14/+8
| | | | | | | | Remove unused headers and stop marking driDriverAPI as PUBLIC.
| * st/dri: Move DRI1 bits in dri_context.c to dri1.c.Chia-I Wu2010-03-183-66/+64
| |
| * st/dri: Move DRI1 bits in dri_drawable.c to dri1.c.Chia-I Wu2010-03-185-319/+336
| |
| * st/dri: Move DRI1 bits in dri_screen.c to dri1.c.Chia-I Wu2010-03-189-82/+173
| |
* | r300g: align misaligned ushort vertex indicesMarek Olšák2010-03-211-1/+29
| |
* | r300g: fix misaligned generated offset for ubyte vertex indicesMarek Olšák2010-03-211-1/+5
| |
* | r300g: split the vertex buffer alignment validationMarek Olšák2010-03-211-22/+29
| |
* | r300g: skip null vertex buffersMarek Olšák2010-03-211-1/+6
| |
* | r300/compiler: fix assertion failure in the r500-fragprog emission pathMarek Olšák2010-03-211-3/+2
| |
* | r300g: Bump immediate limits.Corbin Simpson2010-03-201-3/+2
| | | | | | | | | | Seems like a decent idea, especially since the big barrier now is getting the VBOs back from the VRAM boundary.
* | r300g: Correctly hax max_index on pipe_vertex_buffers.Corbin Simpson2010-03-202-12/+28
| | | | | | | | Still not happy with this, but at least things seem to work.
* | radeong: Use TRUE and FALSE.Corbin Simpson2010-03-201-2/+2
| |
* | radeong: Test the BO ptr for NULL instead of using a bool.Corbin Simpson2010-03-201-8/+4
| | | | | | | | | | Slight memory savings, but more importantly also avoids a potential NULL dereference.
* | r300g: winsys fix tiling change flushes.Dave Airlie2010-03-211-2/+10
| | | | | | | | | | | | | | | | If we change the tiling on a buffer we need to flush it, the old radeon_buffer.c code had this but it crossed streams when I ported to radeon_drm_buffer.c and I missed it. Should fix some piglit regressions. Signed-off-by: Dave Airlie <airlied@redhat.com>
* | r300g: add buffer/texture referenced checks.Dave Airlie2010-03-211-15/+9
| | | | | | | | | | | | | | I've no idea about the comments that were in there, just pass this down to the winsys. Signed-off-by: Dave Airlie <airlied@redhat.com>
* | docs: note GL_EXT_packed_float, GL_EXT_shared_exponent extensionsBrian Paul2010-03-201-0/+1
| |
* | mesa: added GL3 query for GL_TEXTURE_SHARED_SIZEBrian Paul2010-03-201-0/+12
| |
* | mesa: added missing glGet query for GL_MAX_ARRAY_TEXTURE_LAYERS_EXTBrian Paul2010-03-202-0/+18
| |
* | mesa: added new GL3 buffer object queriesBrian Paul2010-03-201-15/+53
| | | | | | | | And clean up the error checking code.
* | mesa: added GL3 buffer attachment aliasesBrian Paul2010-03-201-0/+4
| |
* | mesa: added GL3 ContextFlags field and query codeBrian Paul2010-03-203-1/+17
| |