summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* st/dri: add dri_wrapper.hGeorge Sapountzis2010-03-256-6/+14
|
* st/dri: export DRI1 surface / pipeGeorge Sapountzis2010-03-259-90/+218
| | | | They will be used by DRISW. Also, add destroy functions.
* st/dri: split out DRI2 codeGeorge Sapountzis2010-03-259-370/+476
|
* st/dri: make get_texture into validate_attGeorge Sapountzis2010-03-253-23/+26
| | | | | This is a wrapper around dri_st_framebuffer_validate for a single attachment. Also, call validate through hook to make it more generic.
* st/dri: flush_frontbuffer, allocate_textures for dri2George Sapountzis2010-03-251-17/+40
| | | | dri_st_framebuffer functions just forward to dri1/dri2 functions.
* st/dri: flush_frontbuffer, allocate_textures for dri1George Sapountzis2010-03-253-25/+37
| | | | | | * ptex is get by flush_frontbuffer, similar to swap_buffers * comment for allocate_textures * texture_mask is managed at the st_fb level
* st/dri: minor cosmetic for buffersGeorge Sapountzis2010-03-251-14/+17
|
* st/dri: minor cosmetic for screenGeorge Sapountzis2010-03-251-20/+27
| | | | | - put extensions above init_screen - split out destroy_option_cache
* st/dri: add inline for dri2 check done in multiple placesGeorge Sapountzis2010-03-253-8/+13
|
* drisw_util: add fields for gallium swrast_driGeorge Sapountzis2010-03-252-0/+16
|
* r300g/radeong: fix scons buildJoakim Sindholt2010-03-252-6/+3
|
* Merge branch 'gallium-targets'Jakob Bornecrantz2010-03-25124-421/+312
|\
| * gallium: Fix libgl-xlib path to sw xlib winsysJakob Bornecrantz2010-03-251-1/+1
| |
| * gallium: Add warnings incase pipe drivers are not built in targetsJakob Bornecrantz2010-03-245-0/+20
| |
| * gallium: Make scons build dri/xorg drivers againJakob Bornecrantz2010-03-246-62/+108
| |
| * radeong: Fix scons buildJakob Bornecrantz2010-03-241-1/+1
| |
| * gallium: Reorg winsys directoriesJakob Bornecrantz2010-03-2493-197/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached output from commit. delete mode 100644 src/gallium/winsys/drm/SConscript delete mode 100644 src/gallium/winsys/drm/i965/SConscript delete mode 100644 src/gallium/winsys/drm/intel/Makefile delete mode 100644 src/gallium/winsys/drm/intel/SConscript delete mode 100644 src/gallium/winsys/drm/nouveau/Makefile delete mode 100644 src/gallium/winsys/drm/radeon/Makefile delete mode 100644 src/gallium/winsys/drm/radeon/SConscript delete mode 100644 src/gallium/winsys/drm/vmware/Makefile delete mode 100644 src/gallium/winsys/drm/vmware/SConscript rename src/gallium/winsys/{drm/intel/gem => i915/drm}/Makefile (82%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/SConscript (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_api.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_batchbuffer.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_buffer.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_fence.c (100%) rename src/gallium/winsys/{drm/intel/gem => i915/drm}/intel_drm_winsys.h (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/Makefile (78%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/SConscript (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_api.c (98%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_buffer.c (100%) rename src/gallium/winsys/{drm/i965/gem => i965/drm}/i965_drm_winsys.h (100%) rename src/gallium/winsys/{drm => }/i965/xlib/Makefile (97%) rename src/gallium/winsys/{drm => }/i965/xlib/xlib_i965.c (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/Makefile (79%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_dri.h (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.c (100%) rename src/gallium/winsys/{drm => }/nouveau/drm/nouveau_drm_api.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/Makefile (79%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/SConscript (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_buffer.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_drm_buffer.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.c (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_r300.h (100%) rename src/gallium/winsys/{drm/radeon/core => radeon/drm}/radeon_winsys.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/Makefile (63%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/SConscript (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_buffer.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_context.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_fence.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_dri.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_ioctl.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_pools.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_screen_svga.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.c (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmw_surface.h (100%) rename src/gallium/winsys/{drm/vmware/core => svga/drm}/vmwgfx_drm.h (100%) rename src/gallium/winsys/{drm/i965 => sw}/Makefile (61%) copy src/gallium/winsys/{drm/sw => sw/drm}/Makefile (73%) rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.c (98%) rename src/gallium/winsys/{drm/sw => sw/drm}/sw_drm_api.h (100%) rename src/gallium/winsys/{ => sw}/gdi/SConscript (100%) rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.c (100%) rename src/gallium/winsys/{ => sw}/gdi/gdi_sw_winsys.h (100%) rename src/gallium/winsys/{ => sw}/null/Makefile (78%) rename src/gallium/winsys/{ => sw}/null/SConscript (100%) rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.c (100%) rename src/gallium/winsys/{ => sw}/null/null_sw_winsys.h (100%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/Makefile (65%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.c (100%) rename src/gallium/winsys/{drm/sw => sw/wrapper}/wrapper_sw_winsys.h (100%) rename src/gallium/winsys/{ => sw}/xlib/Makefile (79%) rename src/gallium/winsys/{ => sw}/xlib/SConscript (100%) rename src/gallium/winsys/{ => sw}/xlib/xlib_sw_winsys.c (100%)
| * gallium: Move xorg drivers to targetsJakob Bornecrantz2010-03-2418-47/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached output from git commit: rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/Makefile (95%) rename src/gallium/{winsys/drm/intel/xorg => targets/xorg-i915}/intel_xorg.c (98%) rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/Makefile (78%) rename src/gallium/{winsys/drm/i965/xorg => targets/xorg-i965}/intel_xorg.c (98%) rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/Makefile (96%) rename src/gallium/{winsys/drm/nouveau/xorg => targets/xorg-nouveau}/nouveau_xorg.c (98%) rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/Makefile (73%) rename src/gallium/{winsys/drm/radeon/xorg => targets/xorg-radeon}/radeon_xorg.c (98%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/Makefile (97%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/SConscript (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_driver.h (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_hook.h (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_ioctl.c (99%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_screen.c (100%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_video.c (99%) rename src/gallium/{winsys/drm/vmware/xorg => targets/xorg-vmwgfx}/vmw_xorg.c (100%)
| * gallium: Move egl drivers to targetsJakob Bornecrantz2010-03-2421-52/+51
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Atteched output from git commit: rename src/gallium/{winsys/drm => targets}/Makefile.egl (100%) rename src/gallium/{winsys/drm/intel/egl => targets/egl-i915}/Makefile (86%) rename src/gallium/{winsys/drm/i965/egl => targets/egl-i915}/dummy.c (100%) rename src/gallium/{winsys/drm/i965/egl => targets/egl-i965}/Makefile (86%) rename src/gallium/{winsys/drm/intel/egl => targets/egl-i965}/dummy.c (100%) rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/Makefile (88%) rename src/gallium/{winsys/drm/nouveau/egl => targets/egl-nouveau}/dummy.c (100%) rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/Makefile (87%) rename src/gallium/{winsys/drm/radeon/egl => targets/egl-radeon}/dummy.c (100%) create mode 100644 src/gallium/targets/egl-swrast/Makefile create mode 100644 src/gallium/targets/egl-swrast/swrast_glue.c rename src/gallium/{winsys/drm/vmware/egl => targets/egl-vmwgfx}/Makefile (86%) rename src/gallium/{winsys/drm/swrast/egl => targets/egl-vmwgfx}/dummy.c (100%) delete mode 100644 src/gallium/winsys/drm/swrast/Makefile delete mode 100644 src/gallium/winsys/drm/swrast/core/Makefile delete mode 100644 src/gallium/winsys/drm/swrast/core/swrast_drm_api.c delete mode 100644 src/gallium/winsys/drm/swrast/egl/Makefile delete mode 100644 src/gallium/winsys/drm/vmware/egl/dummy.c
| * gallium: Move dri drivers to targetsJakob Bornecrantz2010-03-2415-43/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Attached output from git commit: rename src/gallium/{winsys/drm/Makefile.template => targets/Makefile.dri} (100%) rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/Makefile (75%) rename src/gallium/{winsys/drm/intel/dri => targets/dri-i915}/SConscript (100%) rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/Makefile (76%) rename src/gallium/{winsys/drm/i965/dri => targets/dri-i965}/SConscript (100%) rename src/gallium/{winsys/drm/nouveau/dri => targets/dri-nouveau}/Makefile (86%) rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/Makefile (85%) rename src/gallium/{winsys/drm/radeon/dri => targets/dri-radeong}/SConscript (100%) rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/Makefile (85%) rename src/gallium/{winsys/drm/vmware/dri => targets/dri-vmwgfx}/SConscript (100%)
| * gallium: Remove GALLIUM_WINSYS_DRM_DIRSJakob Bornecrantz2010-03-246-29/+18
| |
* | r300g: Remove unnecessary header.Vinson Lee2010-03-251-1/+0
| |
* | progs/glsl: Fix vsraytrace GLSL compilation error.Vinson Lee2010-03-241-1/+1
| | | | | | | | | | Fixes the following GLSL error on Mac OS X. '=' : assigning non-constant to 'const 3-component vector of float'
* | progs/glsl: Add raytracing demos to SCons build.Vinson Lee2010-03-241-0/+2
| |
* | llvmpipe: fix up some questionable fence codeBrian Paul2010-03-241-2/+1
| | | | | | | | Jose should probably review this since he wrote the original code.
* | llvmpipe: optimize the lp_setup_fence() functionBrian Paul2010-03-241-6/+20
| | | | | | | | | | Avoid emitting fences when not needed. Speeds up glReadPixels quite a bit when reading image row by row.
* | llvmpipe: call lp_fence_signal()Brian Paul2010-03-241-12/+1
| |
* | llvmpipe: added lp_fence_signal()Brian Paul2010-03-242-0/+20
| |
* | i915g: Correct and add supperted texture formatsJakob Bornecrantz2010-03-252-1/+13
| |
* | st/dri: Fix for X server 1.6.0 (DRI2 version 1)Jakob Bornecrantz2010-03-251-1/+9
| |
* | llvmpipe: fix texture reference counting bugBrian Paul2010-03-242-6/+22
| | | | | | | | | | | | | | | | | | | | We weren't saving the per-scene texture references at the right point. Fixes piglit cubemap segfault. The segfault resulted from referencing texture memory which was prematurely freed because of a missed reference count. Fixes fd.o bug 27276.
* | progs/demos: add other modes/patterns to dissolve demoBrian Paul2010-03-241-6/+131
| |
* | r100/r200/r300/r600: enable accel for Copy/DrawPixels without kmsAlex Deucher2010-03-244-16/+12
| | | | | | | | meta ops should work ok without kms.
* | i965: Handle the negate and abs swizzles on brw_wm_glsl.c immediate args.Eric Anholt2010-03-241-2/+12
|/ | | | | Fixes piglit glsl-orangebook-ch06-bump, regressed with 4fc57322258a750c0a9cabc77372b5ccde1fa877
* progs/glsl: remove/replace //-style commentsBrian Paul2010-03-242-3/+2
|
* progs/glsl: silence warnings, remove debug code, adjust window size, etcBrian Paul2010-03-242-31/+35
|
* demos: import GLSL raytracing demosRALOVICH, Kristóf2010-03-243-1/+751
|
* st/mesa: fix typo in prev commitBrian Paul2010-03-241-1/+1
|
* st/mesa: fix sampler_view destruction bug when texture is sharedBrian Paul2010-03-241-2/+10
| | | | | | | | | | | Since texture's can be shared by many contexts, the texture's sampler view's context pointer might be invalid by time we delete the texture. Prevent crashes/etc by setting the sampler view's context to be the calling context before deleting it. This should be safe as long as all contexts which share the texture are using the same gallium driver. That's a reasonable assumption since pipe_texture objects aren't compatible between different drivers anyway.
* st/mesa: code clean-ups, formatting fixes, comments, etcBrian Paul2010-03-241-16/+31
|
* st/mesa: rename st_clear() to st_Clear()Brian Paul2010-03-241-2/+2
| | | | To be consistent with other Mesa driver functions.
* st/mesa: return GL_TRUE/GL_FALSE if return type is GLbooleanBrian Paul2010-03-241-15/+13
| | | | Just to be consistent.
* progs/egl: Link xeglthreads to libpthread.Chia-I Wu2010-03-241-1/+1
| | | | | This should hopefully fix a build failure reported by Chris Ball when binutils-gold is used.
* swrast: improve depth texture mipmap selectionBrian Paul2010-03-231-11/+30
| | | | | | | We still don't do proper min/mag filtering but this is better than just sampling the base mipmap level all the time. Fixes piglit depth-level-clamp test. Fixes fd.o bug 27256.
* st/glx: add support for multiple displaysBrian Paul2010-03-231-4/+26
| | | | | | | | This is a quick & dirty solution, but it works. See comments in the code for other ideas. Fixes regressions/breakage seen in progs/xdemos/glxheads, etc. from commit 6632915e957149c153a3f793c400a532b4995b18.
* glslcompiler: added option to do linking of vert/frag shadersBrian Paul2010-03-231-12/+37
|
* dri: fix dri_test.c for non-TLS buildLuca Barbieri2010-03-231-2/+7
| | | | | _glapi_Context and _glapi_Dispatch have different constness between TLS and non-TLS builds.
* dri: add _glthread_GetID to dri_test.c dummy glapiLuca Barbieri2010-03-231-0/+6
|
* dri: make unresolved symbol test link work even without a libGL.soLuca Barbieri2010-03-233-2/+70
| | | | | | | | | | | | | | | | Currently the test link uses -lGL to define the glapi symbols. This makes it impossible to build DRI drivers on systems without Mesa installed and without building the libGL from the Mesa tree first. Some automated build systems trigger this problem. This commit removes -lGL and instead adds a dummy implementation of glapi to dri_test.c This, along with Kristian's commit, should fix all known regressions due to the addition of unresolved symbol checking.
* Change libX11 variables to not conflict with AC_PATH_XTRADan Nicholson2010-03-236-9/+13
| | | | | | | | The variable X_LIBS from AC_PATH_XTRA contains only the -L searchdir parameter and not the -lX11 to link to Xlib. Use X11 prefixed build vars for linking with Xlib to avoid the conflict. Signed-off-by: Dan Nicholson <[email protected]>