summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2010-03-09Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell
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
2010-03-09Squashed commit of gallium-no-texture-blanketKeith Whitwell
commit f90b3f01af82b9522067b1824e21709a6fb2d3af Author: Keith Whitwell <keithw@vmware.com> 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 <keithw@vmware.com> Date: Mon Mar 8 14:27:40 2010 +0000 egl/x11: disable texture_blanket usage commit b42da9160df9f47224e5b3291b972f41767aa6e5 Merge: 4be2436 3ca9336 Author: Keith Whitwell <keithw@vmware.com> 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 <keithw@vmware.com> 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 <keithw@vmware.com> Date: Thu Mar 4 13:35:16 2010 +0000 drm_api: wrap comment
2010-03-09st/egl: Use xlib_sw_winsys in ximage backend.Chia-I Wu
2010-03-09winsys/xlib: Fix a segfault when USE_XSHM is not defined.Chia-I Wu
2010-03-09r300g: remove hacks from translate_vertex_data_swizzleMarek Olšák
The first part of the fix of BGRA vertex colors.
2010-03-09draw: quads never provoke the first vertexMarek Olšák
2010-03-09softpipe: quads never provoke the first vertexMarek Olšák
2010-03-09llvmpipe: quads never provoke the first vertexMarek Olšák
2010-03-09mesa/st: Gallium quads, by spec, never change provoking vertex.Corbin Simpson
Fixes glean/clipFlat for r300g.
2010-03-09st/egl: Fix KMS build error after winsys handle change.Chia-I Wu
2010-03-08gallium: update some comments, remove others which are superfluousBrian Paul
2010-03-08vega: remove redundant DEFINES from .c.o ruleBrian Paul
2010-03-08llvmpipe/gallivm: checkpoint: array of pointers to mipmap levelsBrian Paul
Change the texture data_ptr from just a single image pointer to an array of image pointers, indexed by mipmap level. We'll use this for mipmap filtering. For now, the mipmap level is hard-coded to zero.
2010-03-08nv: define NV30/40/50_MAX_TEXTURE_LEVELSBrian Paul
2010-03-08r300g: define R300_MAX_TEXTURE_LEVELSBrian Paul
2010-03-08svga: s/PIPE_MAX_TEXTURE_LEVELS/SVGA_MAX_TEXTURE_LEVELS/Brian Paul
2010-03-08i915g: define I915_MAX_TEXTURE_2D/3D_LEVELSBrian Paul
2010-03-08i965g: define BRW_MAX_TEXTURE_2D/3D_LEVELSBrian Paul
2010-03-08softpipe: define SP_MAX_TEXTURE_2D/3D_LEVELSBrian Paul
2010-03-08llvmpipe: define max texture levelsBrian Paul
2010-03-08llvmpipe: rewrap for 80 columnsBrian Paul
2010-03-08i965: Fix up the handling of point sprite coordinate replacement.Eric Anholt
The code was walking over the regs of pairs of attributes and checking whether the attribute with a given reg index had point sprite enabled. So the point sprite setup code was rarely even getting executed. Instead, we need to determine which channels of a reg need point sprite coordinate replacement. In addition, it was multiplying the attribute by 1/w, when it's supposed to cover (0, 1) in each direction regardless of w, and it wasn't filling in the Z and W components of the texcoord as specified. Fixes piglit point-sprite and the spriteblast demo. Bug #24431, #22245.
2010-03-08gallivm: fix a crash by making sure we set the has_mask flag correctlyZack Rusin
2010-03-08xdemos/omlsync: improve OML WaitMsc testJesse Barnes
Use the divisor/remainder for the WaitForMscOML call if a wait_interval is passed. Allows for testing of the WaitMSC paths in the server & DDX.
2010-03-08gallium: remove xlib_driver::display_surfaceKeith Whitwell
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.
2010-03-08gallium: make it workKeith Whitwell
2010-03-08gallium: introduce target directoryKeith Whitwell
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.
2010-03-08Merge branch '7.8'Brian Paul
2010-03-08softpipe: zero-out entire clear_flags array in sp_tile_cache_flush_clear()Brian Paul
Before, we only cleared the flags for the active tiles (the ones inside the framebuffer bound). The problem is if we later bound a different, larger surface to the tile cache we'd have some stale clear-flags still set (and mistakenly clear some tiles in the new surface). Fixes fd.o bug 26932.
2010-03-08st/mesa: don't detach renderbuffer, surface in st_finish_render_texture()Brian Paul
There's no reason to release the renderbuffer from the framebuffer object or release the gallium surface in this function (they're reference counted). In fact, we don't want to do this because we may later use the texture as a pixel source (ex: glBlitFramebuffer) and need the surface. Fixes fd.o bug 26923 and is part of the fix for bug 26932.
2010-03-08r600: enable GL_ARB_pixel_buffer_objectAlex Deucher
2010-03-08mesa: add additional missing z formats for render to textureBrian Paul
Allow render to texture for X8_Z24 and Z24_X8 formats. Replace big if/else with switch, etc.
2010-03-08radeon/r200/r600: allow src and dst BOs to be placed in GTT during blitAlex Deucher
2010-03-08radeon/r200/r600: reset bos when validating buffers during blitAlex Deucher
2010-03-08r600: recalculate point size, if point min/max size changesAlex Deucher
2010-03-08r600: no need to flush on context initAlex Deucher
2010-03-08r300: don't enable EXT_packed_depth_stencilMaciej Cencora
R300 hw doesn't support sampling from Z24_S8 or S8_Z24 formats.
2010-03-08radeon: no need to emit full state twice after flushMaciej Cencora
2010-03-08r300: allow src and dst BOs to be placed in GTT during blitMaciej Cencora
Fixes some relocation failures
2010-03-08r300: reset bos when validating buffers during blitMaciej Cencora
2010-03-08radeon: fallback to software in glCopyTexImage if blit isn't availableMaciej Cencora
2010-03-08ws/xlib: remove dead filesKeith Whitwell
2010-03-08r300: VAP flush is needed only when vertex program or constants are changedMaciej Cencora
2010-03-08ws/xlib: fixup softpipe buildKeith Whitwell
2010-03-08r300: recalculate point size, if point min/max size changesMaciej Cencora
Fixes two wine d3d9 unit tests
2010-03-08r300: no need to flush on context initMaciej Cencora
2010-03-08r300: remove unnecessary codeMaciej Cencora
_tnl_UpdateFixedFunctionProgram is already called in r300_draw.c
2010-03-08mesa: add render-to-texture case for MESA_FORMAT_S8_Z24Brian Paul
2010-03-08winsys/xlib: remove dependency on glx/x11 state trackerKeith Whitwell
Introduce xlib_drawable struct, pass this down to winsys instead of having it use the internal data structures from glx/x11
2010-03-08ws/xlib: remove redundant declarationsKeith Whitwell