summaryrefslogtreecommitdiffstats
path: root/src/gallium/winsys
Commit message (Collapse)AuthorAgeFilesLines
* svga: fix up breakage from earlier 7.7 mergeBrian Paul2010-01-221-2/+2
|
* Merge branch 'mesa_7_7_branch'Brian Paul2010-01-221-12/+11
|\ | | | | | | | | | | Conflicts: src/mesa/shader/prog_execute.c
| * xlib/softpipe: more buffer free fixesBrian Paul2010-01-221-12/+11
| | | | | | | | | | | | The previous memory leak fix didn't always work properly. Now check the xm_buffer::smh field (now documented!) to see if the buffer points to shared memory.
* | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-228-68/+186
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/draw/draw_context.c src/gallium/auxiliary/draw/draw_pt_fetch_shade_pipeline.c src/gallium/auxiliary/pipebuffer/Makefile src/gallium/auxiliary/pipebuffer/SConscript src/gallium/auxiliary/pipebuffer/pb_buffer_fenced.c src/gallium/auxiliary/tgsi/tgsi_scan.c src/gallium/drivers/i915/i915_surface.c src/gallium/drivers/i915/i915_texture.c src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/llvmpipe/lp_texture.c src/gallium/drivers/softpipe/sp_prim_vbuf.c src/gallium/state_trackers/xorg/xorg_dri2.c src/gallium/winsys/drm/intel/gem/intel_drm_api.c src/gallium/winsys/drm/nouveau/drm/nouveau_drm_api.c src/gallium/winsys/drm/radeon/core/radeon_drm.c src/gallium/winsys/drm/vmware/core/vmw_screen_dri.c src/mesa/state_tracker/st_cb_clear.c
| * vmware/core: Update for pipebuffer changes.José Fonseca2010-01-222-14/+84
| | | | | | | | | | In particular, delay patching GMR relocations until the buffers are validated, since the buffers relative offset can only be established then.
| * vmware/core: Flush preemptively the FIFO commands to keep the GMR working ↵José Fonseca2010-01-211-1/+37
| | | | | | | | set within reasonable bounds.
| * vmware/core: Put GMR pool size in a define.José Fonseca2010-01-212-1/+5
| |
| * vmw/wgl: Update for pipebuffer changes.José Fonseca2010-01-211-1/+3
| | | | | | | | | | | | | | | | This is a minimum change to keep things building and running minimally -- it might cause applications to fail to allocate buffers due to out of GMR memory. A proper update will be commited later.
| * xlib/softpipe: fix buffer memory leakBrian Paul2010-01-201-5/+20
| | | | | | | | Fixes leak caused by window resize.
| * svga: Do a more propper creation of textures from handlesJakob Bornecrantz2010-01-191-49/+19
| |
| * st/drm: Expose kernel driver nameJakob Bornecrantz2010-01-194-0/+4
| | | | | | | | | | | | Based on patch by Chia-I Wu <[email protected]> Expose the name of the kernel driver as accepted by drmOpenByName.
| * ws/vmware: Check DRM version also when bootstrapping in dri2 mode.Thomas Hellstrom2010-01-181-0/+17
| | | | | | | | Signed-off-by: Thomas Hellstrom <[email protected]>
* | st/egl_g3d: Rename to st/egl.Chia-I Wu2010-01-2213-9/+9
| | | | | | | | Simply the name to egl.
* | winsys/drm: Update the options of mklib in Makefile.egl_g3d.Chia-I Wu2010-01-221-1/+2
| | | | | | | | Pass -linker, -ldflags, and $(MKLIB_OPTIONS) to mklib.
* | egl: Remove egl_softpipe.Chia-I Wu2010-01-224-1208/+0
| | | | | | | | | | | | With the addition egl_x11_swrast, egl_softpipe is sort of deprecated. The new driver serves the same purpose as egl_softpipe does. It is based on egl_g3d and provides more features.
* | winsys/drm: Add swrast.Chia-I Wu2010-01-225-0/+48
| | | | | | | | The swrast winsys always returns NULL when drm_api_create is called.
* | st/egl: Remove the egl state tracker.Chia-I Wu2010-01-226-125/+0
| | | | | | | | | | | | The egl_g3d state tracker has support for KMS, and the support is based on the egl state tracker. As egl_g3d provides more features, it should be better to keep only egl_g3d to unify the efforts.
* | winsys/drm: Update Makefile.template.Chia-I Wu2010-01-221-8/+1
| | | | | | | | | | Mainly to respect LDFLAGS and remove unused target $(LIBNAME_EGL). This is based on the patch by Tomáš Chvátal <[email protected]>.
* | Do not include glapi/dispatch.h outside Mesa core.Chia-I Wu2010-01-211-1/+2
| | | | | | | | | | Include the glapi*.h directly instead. glapi/dispatch.h became a Mesa core header since 22884db174b9fb0736cec1c6a192f8b9a97500c1.
* | radeong: Fix EGL driver names.Corbin Simpson2010-01-202-2/+2
| | | | | | | | Using "radeon" instead of "radeong" because we don't have classic EGL.
* | Fix touching live system during install.Tomas Chvatal2010-01-201-1/+1
| |
* | Merge remote branch 'origin/opengl-es-v2'Chia-I Wu2010-01-206-28/+76
|\ \
| * \ Merge branch 'master' into opengl-es-v2Chia-I Wu2010-01-1293-662/+7628
| |\ \ | | | | | | | | | | | | | | | | Conflicts: src/mesa/main/dd.h
| * | | st/egl: Allow APIs other than OpenGL.Chia-I Wu2009-11-104-18/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is done by stopping linking to libmesagallium.a and removing DRI related stuff. The state tracker an application links to decides the API supported. Signed-off-by: Chia-I Wu <[email protected]>
| * | | egl_softpipe: Clean up Makefile.Chia-I Wu2009-11-101-10/+5
| | | | | | | | | | | | | | | | | | | | | | | | Fix generation of depend. Link to the dynamic libraries used. Signed-off-by: Chia-I Wu <[email protected]>
| * | | gallium/xlib: Fix missing symbols when GLX_INDIRECT_RENDERING is defined.Chia-I Wu2009-11-051-0/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When GLX_INDIRECT_RENDERING is defined, some symbols are used in libglapi.a but are not defined. Define them through the help of glapitemp.h. Signed-off-by: Chia-I Wu <[email protected]>
* | | | radeong: Don't allocate HW BOs for constantbufs.Corbin Simpson2010-01-184-12/+41
| | | | | | | | | | | | | | | | | | | | | | | | | | | | We have broken 1000 FPS. Hell yes. Heavily inspired by Marek's patch, but using pipebuffer instead of a roll-your-own malloc.
* | | | radeong: Check DRM version, and report stats.Corbin Simpson2010-01-181-1/+26
| | | |
* | | | radeong: Use vram_size instead of vram_visible.Corbin Simpson2010-01-181-4/+3
| | | | | | | | | | | | | | | | The kernel will decide on its own what to give us.
* | | | i965g: Link against drm_intel instead of drm_radeonJakob Bornecrantz2010-01-171-1/+1
| | | |
* | | | r300g: output texture debug messages if only RADEON_DEBUG=tex is setMarek Olšák2010-01-172-3/+5
| | | |
* | | | i965g: make xorg state tracker build i965g_drv.soDave Airlie2010-01-161-31/+28
| | | | | | | | | | | | | | | | don't make modesetting_drv.so anymore
* | | | radeong: Change DRI driver name to radeong.Corbin Simpson2010-01-131-1/+1
| | | |
* | | | egl: Add _EGLDriver as the first argument to GetProcAddress.Chia-I Wu2010-01-121-1/+1
| |/ / |/| | | | | | | | | | | The rest of the driver API has it as the first argument. It should be there so that a driver has access to itself.
* | | winsys/drm: Use egl_g3d to build EGL drivers.Chia-I Wu2010-01-1211-0/+144
| | | | | | | | | | | | | | | | | | | | | The new EGL drivers use egl_g3d and respect EGL_DISPLAYS. They are named after the display supported and the DRM name. Signed-off-by: Chia-I Wu <[email protected]>
* | | winsys/drm: Add name field to drm_api.Chia-I Wu2010-01-125-0/+5
| | | | | | | | | | | | | | | | | | | | | The name can be used for driver selection. It has the same name as the DRI driver does right now. Signed-off-by: Chia-I Wu <[email protected]>
* | | st/mesa: Remove st_api.c.Chia-I Wu2010-01-121-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | st_api.c is supposed to define st_api_OpenGL to advertise OpenGL support. However, the linker discards the symbol because it has no user. It is better to leave this to other state trackers that link to libmesagallium.a. Signed-off-by: Chia-I Wu <[email protected]>
* | | radeong: Check for DONTBLOCK before flushing, remove dead code.Corbin Simpson2010-01-111-59/+5
| | |
* | | nouveau: Make winsys recognise the original NV50.Marcin Kościelnicki2010-01-111-0/+2
| | |
* | | egl_softpipe: Remove the unnecessary call to _eglSwapBuffers.Chia-I Wu2010-01-111-14/+8
| | | | | | | | | | | | | | | | | | The call to _eglSwapBuffers is unnecessary, and the function is missing when -fvisibility=hidden. Also remove the extraneous braces and indent the block.
* | | scons: Don't build xlib when dri is enabled.José Fonseca2010-01-081-0/+4
| | | | | | | | | | | | Hopefully adddresses fdo 25828.
* | | scons: Output a meaningful message when xlib libGL.so can't be built.José Fonseca2010-01-081-45/+57
| | |
* | | Merge branch 'mesa_7_7_branch'Brian Paul2010-01-041-0/+1
|\ \ \ | | |/ | |/| | | | | | | | | | | | | | | | | | | Conflicts: docs/relnotes.html src/gallium/drivers/llvmpipe/lp_tex_sample_c.c src/gallium/drivers/r300/r300_cs.h src/mesa/drivers/dri/i965/brw_wm_surface_state.c src/mesa/main/enums.c
| * | vmware/xorg: Fix SCons build.Michel Dänzer2010-01-041-0/+1
| | |
| * | gdi: Don't generate import libraries for opengl32.dll.José Fonseca2010-01-031-0/+2
| | | | | | | | | | | | | | | Both MinGW and MSVC include opengl32 import libraries, and its safer to always use those.
* | | gdi: Don't generate import libraries for opengl32.dll.José Fonseca2010-01-021-0/+2
| | | | | | | | | | | | | | | Both MinGW and MSVC include opengl32 import libraries, and its safer to always use those.
* | | gallium: Generate a single library for auxiliaries with Make too.José Fonseca2010-01-012-13/+3
| | |
* | | scons: Aggregate all tiny libraries in a single library.José Fonseca2010-01-018-8/+8
| | | | | | | | | | | | | | | Makes integration of gallium into out of tree components much easier. No pratical change for components in this tree,
* | | Merge branch 'mesa_7_7_branch'Brian Paul2009-12-311-0/+209
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: configs/darwin src/gallium/auxiliary/util/u_clear.h src/gallium/state_trackers/xorg/xorg_exa_tgsi.c src/mesa/drivers/dri/i965/brw_draw_upload.c
| * | Merge branch 'mesa_7_6_branch' into mesa_7_7_branchBrian Paul2009-12-271-0/+209
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/util/u_network.c src/gallium/auxiliary/util/u_network.h src/gallium/drivers/i915/i915_state.c src/gallium/drivers/trace/tr_rbug.c src/gallium/state_trackers/vega/bezier.c src/gallium/state_trackers/vega/vg_context.c src/gallium/state_trackers/xorg/xorg_crtc.c src/gallium/state_trackers/xorg/xorg_driver.c src/gallium/winsys/xlib/xlib_brw_context.c src/mesa/main/mtypes.h