summaryrefslogtreecommitdiffstats
path: root/src/gallium/state_trackers
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into gallium-sampler-viewMichal Krol2010-03-1062-1511/+1706
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/Makefile src/gallium/auxiliary/SConscript src/gallium/auxiliary/tgsi/tgsi_exec.c src/gallium/auxiliary/util/u_blitter.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_context.h src/gallium/drivers/llvmpipe/lp_context.h src/gallium/drivers/nv50/nv50_context.h src/gallium/drivers/nv50/nv50_state_validate.c src/gallium/drivers/nv50/nv50_tex.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_emit.c src/gallium/drivers/r300/r300_state.c src/gallium/drivers/softpipe/sp_context.h src/gallium/drivers/svga/svga_context.h src/gallium/drivers/svga/svga_pipe_sampler.c
| * python: Remove broken link hack.José Fonseca2010-03-102-5/+1
| |
| * python: More build fixes.José Fonseca2010-03-102-1/+7
| |
| * target-helpers: remove swrast_xlib.c helperKeith Whitwell2010-03-101-1/+59
| | | | | | | | | | | | | | | | | | | | This was a good idea, but ended up tying the build systems in knots. We can revisit this later, in particular if we can put in place dummy implementations of cell_create_screen(), llvmpipe_create_screen() which just return NULL if the driver isn't available. In the meantime, just duplicate this smallish function in the two places it was being called.
| * python: Handle the possibility that no driver is selected.José Fonseca2010-03-101-0/+2
| |
| * gallium: remove trace module injection from various state trackersKeith Whitwell2010-03-105-44/+3
| | | | | | | | | | | | | | Components such as state trackers, drivers, etc, should be free to be recombined in arbtrary ways to build driver stacks. They should not be reaching out and trying to build the stack themselves - this is now expected to be handled by the "target" abstraction.
| * python: Fix up state tracker for sw api.José Fonseca2010-03-107-225/+84
| |
| * st/wgl: add missing paramterKeith Whitwell2010-03-101-1/+1
| |
| * gallium: plumb winsys-drawable-handle through to state trackerKeith Whitwell2010-03-107-13/+34
| | | | | | | | | | | | | | The state trackers need this value so that they can supply it as the "void *" argument to flush_frontbuffer. Fixes single-buffer rendering.
| * Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell2010-03-108-6/+36
| |\
| | * Merge branch 'gallium-vertexelementcso'Roland Scheidegger2010-03-098-6/+36
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/auxiliary/cso_cache/cso_context.c src/gallium/auxiliary/util/u_blit.c src/gallium/auxiliary/util/u_gen_mipmap.c src/gallium/drivers/i915/i915_context.h src/gallium/drivers/i965/brw_draw_upload.c src/gallium/drivers/r300/r300_blit.c src/gallium/drivers/r300/r300_context.h src/gallium/drivers/r300/r300_render.c src/gallium/drivers/r300/r300_state_derived.c src/mesa/state_tracker/st_cb_bitmap.c src/mesa/state_tracker/st_cb_clear.c
| | | * vega: adapt to new vertex element csoRoland Scheidegger2010-03-011-4/+4
| | | |
| | | * vega: adapt to new vertex element csoRoland Scheidegger2010-03-015-1/+18
| | | |
| | | * xorg: adapt to new vertex element csoRoland Scheidegger2010-03-012-0/+14
| | | |
| | | * gallium: remove redundant nr_components field from pipe_vertex_elementRoland Scheidegger2010-02-171-1/+0
| | | | | | | | | | | | | | | | | | | | This is a property of the associated src_format pipe format. Hence use util_format_get_nr_components to query this when necessary instead.
| * | | st/egl: Fix build errors in ximage backend after merge.Chia-I Wu2010-03-103-6/+10
| | | | | | | | | | | | | | | | | | | | This fixes assorted merge conflicts when master is merged to gallium-sw-api-2 in 0c96690a5b6e1c2d114e7ec5f1e9d60a4ff2a330.
| * | | egl/x11: use swrast-xlib helperKeith Whitwell2010-03-091-3/+2
| | | |
| * | | gallium: create helper for swrast+xlib combinationKeith Whitwell2010-03-092-5/+7
| | | | | | | | | | | | | | | | | | | | Several targets may want to reuse this code. It's pretty simple, not sure if this is really a win.
| * | | targets/libgl-xlib: add code to inject trace and identity layersKeith Whitwell2010-03-091-7/+1
| | | | | | | | | | | | | | | | | | | | Finally we can inject layers for debug, trace and "other" with relative ease between state-tracker and driver.
| * | | ws/xlib: manage the GC internallyKeith Whitwell2010-03-092-24/+0
| | | | | | | | | | | | | | | | | | | | No need for the user of this winsys to supply/manage the x11 gc for us.
| * | | Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell2010-03-0920-102/+505
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: src/gallium/drivers/llvmpipe/lp_setup.c src/gallium/drivers/softpipe/sp_texture.c src/gallium/drivers/softpipe/sp_winsys.h src/gallium/state_trackers/egl/common/egl_g3d.c src/gallium/state_trackers/egl/x11/native_x11.c src/gallium/state_trackers/egl/x11/native_x11.h src/gallium/state_trackers/egl/x11/native_ximage.c
| | * | Squashed commit of gallium-no-texture-blanketKeith Whitwell2010-03-091-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | commit f90b3f01af82b9522067b1824e21709a6fb2d3af Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:39:44 2010 +0000 gallium: remove p_screen::surface_buffer_create This isn't very useful without texture_blanket(), which has also been removed. Note that this function hasn't been removed from the old pipe_winsys (u_simple_screen) still used internally by some drivers (eg softpipe). commit 6c462de39a4b9980a5f034a95e580efdfcb8173b Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:27:40 2010 +0000 egl/x11: disable texture_blanket usage commit b42da9160df9f47224e5b3291b972f41767aa6e5 Merge: 4be2436 3ca9336 Author: Keith Whitwell <[email protected]> Date: Mon Mar 8 14:27:24 2010 +0000 Merge commit 'origin/master' into gallium-no-texture-blanket Conflicts: src/gallium/drivers/svga/svga_screen_texture.c commit 4be2436316929e3dfc55bc34d810920c06556b66 Author: Keith Whitwell <[email protected]> Date: Thu Mar 4 14:59:26 2010 +0000 gallium: remove texture blanket call No longer needed, except for nouveau and egl/xll/native_ximage.c. Fix for nouveau is to keep the call, but move it to an internal function within nouveau. Fix for that egl/x11 relies on gallium-sw-api branch or its successor. commit 69b6764330367d63c237d0bde9fb96435d0e0257 Author: Keith Whitwell <[email protected]> Date: Thu Mar 4 13:35:16 2010 +0000 drm_api: wrap comment
| | * | st/egl: Fix KMS build error after winsys handle change.Chia-I Wu2010-03-091-5/+9
| | | |
| | * | vega: remove redundant DEFINES from .c.o ruleBrian Paul2010-03-081-1/+1
| | | |
| | * | Merge branch '7.8'Brian Paul2010-03-081-3/+0
| | |\ \
| | | * | st/vega: Fix OpenVG demo segfaults.Chia-I Wu2010-03-081-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the paint is color, paint_bind_samplers binds a dummy sampler without a texture. It causes demos requiring a sampler (those use a mask or an image) to crash.
| | * | | Merge commit 'origin/gallium-winsys-handle-rebased'Keith Whitwell2010-03-088-31/+44
| | |\ \ \ | | | |/ / | | |/| |
| | | * | gallium: Reorg texture usage flagsJakob Bornecrantz2010-03-015-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce a new shared usage and rename primary to scanout. The display target usage is more of a windows concept and doesn't mean the same thing as shared. Display target means that the surface should be presentable, for softpipe this means that it should be backed by a hardware buffer.
| | | * | gallium: Expose a opaque winsys handle and functions on pipe_screenJakob Bornecrantz2010-03-015-22/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead of having these functions on a side interface like on drm_api create a opaque winsys_handle that is to be passed down into the winsys. Currently the only thing ported to this new interface is drm_api, and of that only the components that builds by default is ported. All the drivers and any extra state trackers needs to be ported before this can go into master.
| | * | | st/egl: Add support for EGL_KHR_image_base and EGL_KHR_image_pixmap.Chia-I Wu2010-03-054-3/+202
| | | | | | | | | | | | | | | | | | | | | | | | | These extensions are not quite useful until the client APIs gain support for the respective EGLImage extensions.
| | * | | st/egl: Add get_param to native display interface.Chia-I Wu2010-03-054-0/+72
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | get_param can be used to query the parameters of a native display. There is only NATIVE_PARAM_USE_NATIVE_BUFFER right now. It queries whether the window/pixmap surfaces use the native buffers instead of private buffers.
| | * | | st/egl: Move modeset interface to native_modeset.h.Chia-I Wu2010-03-052-55/+89
| | | | | | | | | | | | | | | | | | | | | | | | | native.h is getting more and more complex. Move the independent modeset interface to native_modeset.h to simplify native.h a little.
| | * | | st/egl: Add event support to the native display interface.Chia-I Wu2010-03-058-14/+106
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There is only invalid_surface event right now. When EGL receives the event, it sets the force_validate flag of the context binding to the surface. This helps skip an unnecessary check.
| * | | | st/egl: Use xlib_sw_winsys in ximage backend.Chia-I Wu2010-03-097-451/+45
| | | | |
| * | | | gallium: remove xlib_driver::display_surfaceKeith Whitwell2010-03-081-7/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Just use flush_frontbuffer directly. The flush_frontbuffer routine has been somewhat devalued recently, but it is actually just the right interface for our needs. It is in pipe_screen, meaning that any wrapping (eg trace module) will get properly unwrapped before we try and use the pipe_surface argument for real. If a particular co-state-tracker needs to implement this itself, it should organize a way to allow the winsys to call back up to its level, rather than hijacking the driver-supplied implementation.
| * | | | gallium: introduce target directoryKeith Whitwell2010-03-082-13/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently there are still at least two functions bundled up inside the winsys concept: a) that of a backend resource manager, sometimes capable of performing present() operations, b) the initialization code/routine for the whole driver stack. The inclusion of (b) makes it difficult to share implementations of (a) between different drivers. For instance, a clean xlib winsys could be of use for software-rasterized VG, GLES, EGL, etc, stacks. But that is only true as long as there is no dependency from the winsys to higher level code, as would be the case when we include (b) in this component. This change creates a new gallium/targets subtree, specifically for implementing the glue needed to build individual driver stacks, and moves that code out of a single example winsys, namely xlib. Other drivers continue to build unchanged, but hopefully can migrate to this structure over time.
| * | | | winsys/xlib: remove dependency on glx/x11 state trackerKeith Whitwell2010-03-084-93/+25
| |/ / / | | | | | | | | | | | | | | | | Introduce xlib_drawable struct, pass this down to winsys instead of having it use the internal data structures from glx/x11
| * | | wgl: Fix mingw32 build.Vinson Lee2010-03-031-2/+0
| | | | | | | | | | | | | | | | This was missed in commit fcf438e9e03f6e75bca4a49ad372fe7c4b1abbf8.
| * | | mesa: Remove support for creating color-index visualsIan Romanick2010-03-031-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the rgbMode and indexBits parameters from _mesa_create_visual and _mesa_initialize_visual. These values are now hardcoded to GL_TRUE and 0. Signed-off-by: Ian Romanick <[email protected]>
| * | | Merge branch 'gallium-format-cleanup'José Fonseca2010-03-0219-78/+78
| |\ \ \
| | * | | python: Rename pipe formats.José Fonseca2010-03-012-2/+2
| | | | |
| | * | | vega: Rename pipe formats.José Fonseca2010-03-015-13/+13
| | | | |
| | * | | wgl: Rename pipe formats.José Fonseca2010-03-011-11/+11
| | | | |
| | * | | xorg: Rename pipe formats.José Fonseca2010-03-014-11/+11
| | | | |
| | * | | glx: Rename pipe formats.José Fonseca2010-03-011-7/+7
| | | | |
| | * | | egl: Rename pipe formats.José Fonseca2010-03-014-19/+19
| | | | |
| | * | | dri: Rename pipe formats.José Fonseca2010-03-012-14/+14
| | | | |
| | * | | xlib: Use PIPE_FORMAT_R8G8B8A8_UNORM(_REV) as appropriate.José Fonseca2010-03-011-2/+2
| | |/ /
| * / / glapi.c: misc coscmetic for FreeTSDGeorge Sapountzis2010-03-011-2/+2
| |/ / | | | | | | | | | | | | | | | | | | | | | - move out of of the dispatch/context block to after corresponding init functions - use more consistent naming with corresponding init functions - XXX use _glthread_InitTSD() vs (void)_glthread_GetTSD() in _glapi_check_multithread() XXX
| * | python: Don't mention deprecated drivers=trace option.José Fonseca2010-03-011-1/+1
| | | | | | | | | | | | Now trace always built.