summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'origin/master' into gallium-sw-api-2Keith Whitwell2010-03-09287-17007/+11936
|\ | | | | | | | | | | | | | | | | | | | | 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-0919-428/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * r300g: remove hacks from translate_vertex_data_swizzleMarek Olšák2010-03-091-20/+4
| | | | | | | | The first part of the fix of BGRA vertex colors.
| * draw: quads never provoke the first vertexMarek Olšák2010-03-092-58/+20
| |
| * softpipe: quads never provoke the first vertexMarek Olšák2010-03-091-68/+12
| |
| * llvmpipe: quads never provoke the first vertexMarek Olšák2010-03-091-93/+36
| |
| * mesa/st: Gallium quads, by spec, never change provoking vertex.Corbin Simpson2010-03-091-0/+3
| | | | | | | | Fixes glean/clipFlat for r300g.
| * st/egl: Fix KMS build error after winsys handle change.Chia-I Wu2010-03-091-5/+9
| |
| * gallium: update some comments, remove others which are superfluousBrian Paul2010-03-081-5/+5
| |
| * vega: remove redundant DEFINES from .c.o ruleBrian Paul2010-03-081-1/+1
| |
| * llvmpipe/gallivm: checkpoint: array of pointers to mipmap levelsBrian Paul2010-03-087-44/+81
| | | | | | | | | | | | | | 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.
| * nv: define NV30/40/50_MAX_TEXTURE_LEVELSBrian Paul2010-03-083-3/+9
| |
| * r300g: define R300_MAX_TEXTURE_LEVELSBrian Paul2010-03-081-6/+8
| |
| * svga: s/PIPE_MAX_TEXTURE_LEVELS/SVGA_MAX_TEXTURE_LEVELS/Brian Paul2010-03-081-1/+1
| |
| * i915g: define I915_MAX_TEXTURE_2D/3D_LEVELSBrian Paul2010-03-083-7/+10
| |
| * i965g: define BRW_MAX_TEXTURE_2D/3D_LEVELSBrian Paul2010-03-082-6/+9
| |
| * softpipe: define SP_MAX_TEXTURE_2D/3D_LEVELSBrian Paul2010-03-082-5/+9
| |
| * llvmpipe: define max texture levelsBrian Paul2010-03-082-5/+9
| |
| * llvmpipe: rewrap for 80 columnsBrian Paul2010-03-081-9/+13
| |
| * i965: Fix up the handling of point sprite coordinate replacement.Eric Anholt2010-03-083-66/+96
| | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * gallivm: fix a crash by making sure we set the has_mask flag correctlyZack Rusin2010-03-081-2/+1
| |
| * xdemos/omlsync: improve OML WaitMsc testJesse Barnes2010-03-081-4/+6
| | | | | | | | | | 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.
| * Merge branch '7.8'Brian Paul2010-03-089-24/+96
| |\
| | * softpipe: zero-out entire clear_flags array in sp_tile_cache_flush_clear()Brian Paul2010-03-081-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * st/mesa: don't detach renderbuffer, surface in st_finish_render_texture()Brian Paul2010-03-081-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| | * r600: enable GL_ARB_pixel_buffer_objectAlex Deucher2010-03-081-0/+1
| | |
| | * mesa: add additional missing z formats for render to textureBrian Paul2010-03-081-15/+83
| | | | | | | | | | | | | | | Allow render to texture for X8_Z24 and Z24_X8 formats. Replace big if/else with switch, etc.
| | * radeon/r200/r600: allow src and dst BOs to be placed in GTT during blitAlex Deucher2010-03-083-24/+6
| | |
| | * radeon/r200/r600: reset bos when validating buffers during blitAlex Deucher2010-03-083-0/+8
| | |
| | * r600: recalculate point size, if point min/max size changesAlex Deucher2010-03-081-0/+2
| | |
| | * r600: no need to flush on context initAlex Deucher2010-03-081-2/+0
| | |
| | * r300: don't enable EXT_packed_depth_stencilMaciej Cencora2010-03-081-1/+3
| | | | | | | | | | | | R300 hw doesn't support sampling from Z24_S8 or S8_Z24 formats.
| | * radeon: no need to emit full state twice after flushMaciej Cencora2010-03-081-5/+0
| | |
| | * r300: allow src and dst BOs to be placed in GTT during blitMaciej Cencora2010-03-081-8/+2
| | | | | | | | | | | | Fixes some relocation failures
| | * r300: reset bos when validating buffers during blitMaciej Cencora2010-03-081-0/+3
| | |
| | * radeon: fallback to software in glCopyTexImage if blit isn't availableMaciej Cencora2010-03-081-0/+4
| | |
| | * r300: VAP flush is needed only when vertex program or constants are changedMaciej Cencora2010-03-084-25/+2
| | |
| | * r300: recalculate point size, if point min/max size changesMaciej Cencora2010-03-081-0/+2
| | | | | | | | | | | | Fixes two wine d3d9 unit tests
| | * r300: no need to flush on context initMaciej Cencora2010-03-081-2/+0
| | |
| | * r300: remove unnecessary codeMaciej Cencora2010-03-081-17/+0
| | | | | | | | | | | | _tnl_UpdateFixedFunctionProgram is already called in r300_draw.c
| | * mesa: add render-to-texture case for MESA_FORMAT_S8_Z24Brian Paul2010-03-081-0/+5
| | |
| | * mesa: s/GL_DEPTH_STENCIL/GL_DEPTH_COMPONENT/ for MESA_FORMAT_Z16 renderbufferBrian Paul2010-03-081-1/+1
| | | | | | | | | | | | MESA_FORMAT_Z16 has no stencil bits.
| | * 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.
| | * gallivm: Initialize variables for default cases.Vinson Lee2010-03-061-0/+4
| | | | | | | | | | | | Fixes use of uninitialized variables in non-debug builds.
| | * progs/demos: Add arbocclude2 to Makefile and .gitignore.Vinson Lee2010-03-052-0/+2
| | |
| | * glx: Move initialization of ext_list_first_time to where it's storage is ↵Brian Paul2010-03-054-9/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | allocated Move the initialization of ext_list_first_time from all of the DRI loader's CreateScreen routines, to where the storage for the screen config is allocated. It needs to get set in the screen-config even if DRI is forced off using LIBGL_ALWAYS_INDIRECT, so that psc->direct_support is initialized correctly, otherwise __glXExtensionBitIsEnabled() always returns FALSE Specifically, this causes a problem with an X server which advertises GLX<=1.2, and the GLX_SGIX_fbconfig extension. glXGetFBConfigFromVisualSGIX() uses __glXExtensionBitIsEnabled() to check if the GLX_SGIX_fbconfig extension is available, but that function won't return correct information because that data has never been initialized, because ext_list_first_time was never set... Signed-off-by: Jon TURNEY <[email protected]> Signed-off-by: Brian Paul <[email protected]> (cherry picked from commit 96ab4d2b84178209ee59017458d9964b32b7e183)
| | * docs: remove merge conflict garbageBrian Paul2010-03-051-1/+0
| | |
| * | radeon/r200/r600: allow src and dst BOs to be placed in GTT during blitAlex Deucher2010-03-083-24/+6
| | |
| * | radeon/r200/r600: reset bos when validating buffers during blitAlex Deucher2010-03-083-0/+8
| | |
| * | r600: recalculate point size, if point min/max size changesAlex Deucher2010-03-081-0/+2
| | |