Brian Paul [Thu, 25 Mar 2010 22:12:01 +0000 (16:12 -0600)]
Merge branch '7.8'
Brian Paul [Thu, 25 Mar 2010 22:06:07 +0000 (16:06 -0600)]
Revert "llvmpipe: optimize the lp_setup_fence() function"
This reverts commit
a9063cad0f0190ff88cd20fbad5aa87bf1a943f6.
Not too surprisingly, this change caused some regressions.
Revert it for the time being.
See fd.o bug 27320.
Brian Paul [Thu, 25 Mar 2010 22:04:40 +0000 (16:04 -0600)]
llvmpipe: disable an assertion
We shouldn't try to clear a non-existant z/stencil buffer, so there's
probably a bug elsewhere. Disable the assertion for now to allow things
to at least run.
Brian Paul [Thu, 25 Mar 2010 22:03:13 +0000 (16:03 -0600)]
glapi: return int = 0 from NoOpGeneric()
If a GL function is called w/out a current rendering context, this stub
gets called. It should return 0 so that non-void-valued functions return
0/NULL instead of a random number.
Jakob Bornecrantz [Thu, 25 Mar 2010 21:21:39 +0000 (22:21 +0100)]
gallium: Add propper sanity checks in configure.ac
Vinson Lee [Thu, 25 Mar 2010 19:58:36 +0000 (12:58 -0700)]
glslcompiler: Fix build.
Jakob Bornecrantz [Thu, 25 Mar 2010 17:28:31 +0000 (18:28 +0100)]
st/dri: Don't include sw vs drm dri headers
Jakob Bornecrantz [Thu, 25 Mar 2010 16:54:41 +0000 (17:54 +0100)]
st/dri: Add dri2 prefix for all dri2.c functions
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
configure:ac add swrastg_dri
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
st/dri: add TODO list for DRISW
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: hack for loader hardcoded stride
George Sapountzis [Thu, 25 Mar 2010 15:01:54 +0000 (17:01 +0200)]
swrastg_dri: add winsys and target
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
swrastg_dri: add state_tracker
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add drisw
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: add dri_wrapper.h
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: export DRI1 surface / pipe
They will be used by DRISW. Also, add destroy functions.
George Sapountzis [Thu, 25 Mar 2010 15:01:53 +0000 (17:01 +0200)]
st/dri: split out DRI2 code
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: make get_texture into validate_att
This is a wrapper around dri_st_framebuffer_validate for a single attachment.
Also, call validate through hook to make it more generic.
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: flush_frontbuffer, allocate_textures for dri2
dri_st_framebuffer functions just forward to dri1/dri2 functions.
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: flush_frontbuffer, allocate_textures for dri1
* ptex is get by flush_frontbuffer, similar to swap_buffers
* comment for allocate_textures
* texture_mask is managed at the st_fb level
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: minor cosmetic for buffers
George Sapountzis [Thu, 25 Mar 2010 15:01:52 +0000 (17:01 +0200)]
st/dri: minor cosmetic for screen
- put extensions above init_screen
- split out destroy_option_cache
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
st/dri: add inline for dri2 check done in multiple places
George Sapountzis [Thu, 25 Mar 2010 15:01:51 +0000 (17:01 +0200)]
drisw_util: add fields for gallium swrast_dri
Joakim Sindholt [Thu, 25 Mar 2010 14:51:23 +0000 (15:51 +0100)]
r300g/radeong: fix scons build
Jakob Bornecrantz [Thu, 25 Mar 2010 13:48:41 +0000 (14:48 +0100)]
Merge branch 'gallium-targets'
Jakob Bornecrantz [Thu, 25 Mar 2010 13:42:40 +0000 (14:42 +0100)]
gallium: Fix libgl-xlib path to sw xlib winsys
Vinson Lee [Thu, 25 Mar 2010 07:20:05 +0000 (00:20 -0700)]
r300g: Remove unnecessary header.
Vinson Lee [Thu, 25 Mar 2010 05:53:23 +0000 (22:53 -0700)]
progs/glsl: Fix vsraytrace GLSL compilation error.
Fixes the following GLSL error on Mac OS X.
'=' : assigning non-constant to 'const 3-component vector of float'
Vinson Lee [Thu, 25 Mar 2010 05:36:49 +0000 (22:36 -0700)]
progs/glsl: Add raytracing demos to SCons build.
Brian Paul [Thu, 25 Mar 2010 02:40:31 +0000 (20:40 -0600)]
llvmpipe: fix up some questionable fence code
Jose should probably review this since he wrote the original code.
Brian Paul [Thu, 25 Mar 2010 02:49:12 +0000 (20:49 -0600)]
llvmpipe: optimize the lp_setup_fence() function
Avoid emitting fences when not needed.
Speeds up glReadPixels quite a bit when reading image row by row.
Brian Paul [Thu, 25 Mar 2010 01:28:41 +0000 (19:28 -0600)]
llvmpipe: call lp_fence_signal()
Brian Paul [Thu, 25 Mar 2010 01:30:27 +0000 (19:30 -0600)]
llvmpipe: added lp_fence_signal()
Jakob Bornecrantz [Wed, 24 Mar 2010 23:41:21 +0000 (00:41 +0100)]
i915g: Correct and add supperted texture formats
Jakob Bornecrantz [Wed, 24 Mar 2010 23:27:46 +0000 (00:27 +0100)]
st/dri: Fix for X server 1.6.0 (DRI2 version 1)
Brian Paul [Wed, 24 Mar 2010 22:27:31 +0000 (16:27 -0600)]
llvmpipe: fix texture reference counting bug
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.
Brian Paul [Fri, 19 Mar 2010 17:34:43 +0000 (11:34 -0600)]
progs/demos: add other modes/patterns to dissolve demo
Alex Deucher [Fri, 12 Mar 2010 18:58:56 +0000 (13:58 -0500)]
r100/r200/r300/r600: enable accel for Copy/DrawPixels without kms
meta ops should work ok without kms.
Maciej Cencora [Sun, 21 Mar 2010 11:43:38 +0000 (12:43 +0100)]
r300: report correct state atom size
Spotted by Pauli Nieminen
Maciej Cencora [Sun, 21 Mar 2010 11:12:05 +0000 (12:12 +0100)]
r300: fix off by one
R300_PVS_MAX_CONST_ADDR field holds highest const addr, not
const count.
Fixes missing models and others rendering errors for vertex
program using 256 params.
Maciej Cencora [Sun, 21 Mar 2010 11:10:06 +0000 (12:10 +0100)]
r300: fix vertex programs with big number of params (>255) under KMS
UMS will probably require some kernel work
Maciej Cencora [Sun, 21 Mar 2010 10:34:19 +0000 (11:34 +0100)]
r300: fix wpos/fog handling
It may happen that the vertex attribute we were going to stuff
the wpos/fog attrs in was already written by vertex program.
In such cases we need to remove instruction accessing these
attributes, so they don't overwrite the wpos/fog related
instructions.
This fixes non-textured models in many wine games.
Maciej Cencora [Sun, 21 Mar 2010 10:19:02 +0000 (11:19 +0100)]
r300: clean fog_attr/wpos_attr if code accessing these attributes has been removed FP during compilation
Jakob Bornecrantz [Wed, 24 Mar 2010 18:16:29 +0000 (19:16 +0100)]
gallium: Add warnings incase pipe drivers are not built in targets
Jakob Bornecrantz [Wed, 24 Mar 2010 17:42:35 +0000 (18:42 +0100)]
gallium: Make scons build dri/xorg drivers again
Eric Anholt [Wed, 24 Mar 2010 17:26:05 +0000 (10:26 -0700)]
i965: Handle the negate and abs swizzles on brw_wm_glsl.c immediate args.
Fixes piglit glsl-orangebook-ch06-bump, regressed with
4fc57322258a750c0a9cabc77372b5ccde1fa877
Jakob Bornecrantz [Wed, 24 Mar 2010 17:09:19 +0000 (18:09 +0100)]
radeong: Fix scons build
Jakob Bornecrantz [Tue, 16 Mar 2010 13:54:18 +0000 (13:54 +0000)]
gallium: Reorg winsys directories
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%)
Jakob Bornecrantz [Wed, 24 Mar 2010 10:45:30 +0000 (11:45 +0100)]
gallium: Move xorg drivers to targets
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%)
Jakob Bornecrantz [Wed, 24 Mar 2010 09:58:45 +0000 (10:58 +0100)]
gallium: Move egl drivers to targets
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
Jakob Bornecrantz [Tue, 23 Mar 2010 13:23:26 +0000 (13:23 +0000)]
gallium: Move dri drivers to targets
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%)
Jakob Bornecrantz [Tue, 16 Mar 2010 13:44:32 +0000 (13:44 +0000)]
gallium: Remove GALLIUM_WINSYS_DRM_DIRS
Brian Paul [Wed, 24 Mar 2010 15:08:24 +0000 (09:08 -0600)]
progs/glsl: remove/replace //-style comments
Brian Paul [Wed, 24 Mar 2010 15:03:33 +0000 (09:03 -0600)]
progs/glsl: silence warnings, remove debug code, adjust window size, etc
RALOVICH, Kristóf [Wed, 24 Mar 2010 01:48:15 +0000 (21:48 -0400)]
demos: import GLSL raytracing demos
Brian Paul [Wed, 24 Mar 2010 15:00:48 +0000 (09:00 -0600)]
st/mesa: fix typo in prev commit
Brian Paul [Wed, 24 Mar 2010 14:34:26 +0000 (08:34 -0600)]
st/mesa: fix sampler_view destruction bug when texture is shared
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.
Brian Paul [Wed, 24 Mar 2010 14:25:24 +0000 (08:25 -0600)]
st/mesa: code clean-ups, formatting fixes, comments, etc
Brian Paul [Wed, 24 Mar 2010 14:18:13 +0000 (08:18 -0600)]
st/mesa: rename st_clear() to st_Clear()
To be consistent with other Mesa driver functions.
Brian Paul [Wed, 24 Mar 2010 14:16:25 +0000 (08:16 -0600)]
st/mesa: return GL_TRUE/GL_FALSE if return type is GLboolean
Just to be consistent.
Chia-I Wu [Wed, 24 Mar 2010 00:34:39 +0000 (08:34 +0800)]
progs/egl: Link xeglthreads to libpthread.
This should hopefully fix a build failure reported by Chris Ball when
binutils-gold is used.
Brian Paul [Tue, 23 Mar 2010 23:55:41 +0000 (17:55 -0600)]
swrast: improve depth texture mipmap selection
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.
Brian Paul [Tue, 23 Mar 2010 23:22:43 +0000 (17:22 -0600)]
st/glx: add support for multiple displays
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.
Brian Paul [Tue, 23 Mar 2010 17:46:02 +0000 (11:46 -0600)]
glslcompiler: added option to do linking of vert/frag shaders
Luca Barbieri [Tue, 23 Mar 2010 21:59:44 +0000 (22:59 +0100)]
dri: fix dri_test.c for non-TLS build
_glapi_Context and _glapi_Dispatch have different constness between
TLS and non-TLS builds.
Luca Barbieri [Tue, 23 Mar 2010 21:57:25 +0000 (22:57 +0100)]
dri: add _glthread_GetID to dri_test.c dummy glapi
Luca Barbieri [Tue, 23 Mar 2010 20:10:07 +0000 (21:10 +0100)]
dri: make unresolved symbol test link work even without a libGL.so
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.
Dan Nicholson [Tue, 16 Mar 2010 03:53:56 +0000 (20:53 -0700)]
Change libX11 variables to not conflict with AC_PATH_XTRA
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 <dbn.lists@gmail.com>
Eric Anholt [Wed, 24 Mar 2010 03:52:06 +0000 (20:52 -0700)]
i965: Stop abusing ctx->NewState flags for storing driver internal changes.
We're still abusing the flags by putting them where our driver stores
ctx->NewState changes. Making them into more restricted state change
flags would be a project for later.
Fixes a failure where calling intel_draw_buffer() too often would trip
up Mesa assertions about when Mesa state could get changed, when it hadn't.
Bug #27034.
Kristian Høgsberg [Tue, 23 Mar 2010 19:47:49 +0000 (15:47 -0400)]
dri: Add $(DRI_LIB_DEPS) when linking the test binary
This will make sure we pick up libdrm_$(chipset).so from the right place.
Eric Anholt [Wed, 24 Mar 2010 03:52:06 +0000 (20:52 -0700)]
i965: Stop abusing ctx->NewState flags for storing driver internal changes.
We're still abusing the flags by putting them where our driver stores
ctx->NewState changes. Making them into more restricted state change
flags would be a project for later.
Fixes a failure where calling intel_draw_buffer() too often would trip
up Mesa assertions about when Mesa state could get changed, when it hadn't.
Bug #27034.
Kristian Høgsberg [Tue, 23 Mar 2010 16:07:45 +0000 (12:07 -0400)]
mesa: Also print _NEW_STENCIL in _mesa_print_state()
Luca Barbieri [Mon, 11 Jan 2010 02:13:42 +0000 (03:13 +0100)]
nvfx: add NOUVEAU_VTXIDX_IN_VRAM variable to put vertex/index buffers in VRAM
On some systems, putting vertex and index buffers in VRAM instead of GART
memory eliminates massive graphics corruption which is otherwise present,
due to unclear causes.
This patch adds an environment variable that does that, along with helpful
messages.
It turns it on by default on G7x, as it is what I am seeing corruption
on and some other reports also seemed to pinpoint these cards.
Luca Barbieri [Tue, 23 Mar 2010 15:34:51 +0000 (16:34 +0100)]
nvfx: delay allocation of buffers in GART/VRAM to validation time
Currently we allocate buffers in GART or VRAM at creation time.
However, when using swtnl, this results in reads from uncached
memory, which drastically impair performance.
So, for now, cause nouveau_screen.c to not pass any placement flags
to buffer creation, so that the buffers are moved later.
Previously libdrm itself did this, but was changed to not to do it.
This may introduce an extra copy in normal usage, but this currently
does not seem to introduce significant performance degradation.
This will be revisited when pipebuffer is integrated.
Note that for AGP systems, properly solving this may be complex
since currently there is no fast way of reading from GART/VRAM.
We will probably need to try mapping AGP as writethrough and, in
addition, make buffer creation more aware of future buffer usage.
Luca Barbieri [Tue, 23 Mar 2010 16:40:42 +0000 (17:40 +0100)]
st/mesa: make st_manager.c set have[Stencil|Depth]Buffer only if bits > 0
Fixes a segfault when clearing a non-existent stencil buffer.
Luca Barbieri [Tue, 23 Mar 2010 16:55:38 +0000 (17:55 +0100)]
dri: use mv -f instead of mv to ensure no prompting occurs
Using just mv may cause prompts on some systems/configurations.
Brian Paul [Tue, 23 Mar 2010 15:23:26 +0000 (09:23 -0600)]
docs: update docs with 7.7.1 and 7.8 release info
Brian Paul [Tue, 23 Mar 2010 15:14:17 +0000 (09:14 -0600)]
Merge branch '7.8'
Conflicts:
Makefile
src/gallium/state_trackers/glx/xlib/xm_api.c
src/mesa/drivers/dri/intel/intel_blit.c
src/mesa/drivers/dri/intel/intel_pixel_copy.c
src/mesa/main/version.h
Brian Paul [Tue, 23 Mar 2010 15:08:35 +0000 (09:08 -0600)]
softpipe: comments, re-formatting, etc
Brian Paul [Tue, 23 Mar 2010 15:00:19 +0000 (09:00 -0600)]
softpipe: add special cases for all Z compare modes for 16-bit Z buffer
We had fast paths for PIPE_FUNC_LESS and LEQUAL before. To satisfy
OpenGL invariance rules, all depth compare modes should produce the
same fragment Z values.
Fixes progs/demos/singlebuffer.c
Brian Paul [Tue, 23 Mar 2010 14:58:09 +0000 (08:58 -0600)]
st/glx: better format selection in xmesa_choose_z_stencil_format()
This is a back-port of commit
ef2664da6c4db1b52ef351641e3ee949b87f9c7b
from master.
Luca Barbieri [Sun, 17 Jan 2010 21:27:53 +0000 (22:27 +0100)]
nvfx: don't crash on empty fragment program
Luca Barbieri [Wed, 17 Mar 2010 21:31:29 +0000 (22:31 +0100)]
nvfx: fix coding style in nvfx_transfer.c
Luca Barbieri [Wed, 17 Mar 2010 19:31:56 +0000 (20:31 +0100)]
nvfx: stop incessantly spewing debug messages on the terminal
Currently we are continuously spewing messages about these variables
since we call debug_get_bool_option everytime we want to check their value.
This is annoying, slows things down due to terminal rerendering
and obscures useful messages.
This patch only calls debug_get_bool_option once and caches the result in a
static variable.
Luca Barbieri [Wed, 17 Mar 2010 14:44:45 +0000 (15:44 +0100)]
nvfx: fix/workaround nv3x hwtnl issues
This patch re-emits the viewport state on framebuffer or rasterizer
change.
This seems to be necessary on nv3x, but the reason is not fully
understood.
It is quite likely that this isn't really the correct fix, but seems
to work, and makes nv3x much better.
Luca Barbieri [Mon, 15 Mar 2010 17:36:27 +0000 (18:36 +0100)]
dri: test whether the built drivers have unresolved symbols
This is a different approach to solving this problem that the patch
I previously posted, and unlike that, should not cause any problems.
Right now undefined symbols in DRI drivers will still allow the
build to succeed.
As a result, people modifying drivers they cannot test risk creating
unloadable drivers with no easy way of automatically avoiding it.
For instance, the modifications to nv50 for context transfers caused
such an issue recently.
Unfortunately, just adding -Wl,--no-undefined doesn't work, because
the DRI drivers depend on glapi symbols, but do not depend on
libGL.so.1
Adding -lGL is not the correct solution since DRI drivers are not loaded
just by libGL, but also by X and possibly by other clients.
So, this patch simply tries to build an executable linked to the DRI
driver and to libGL.
If the DRI driver contains any undefined symbols not satisfied by its
dependencies or by libGL, this will fail.
This solution does not alter the built drivers, and does not significantly
slow down the build process.
All classic DRI drivers as well as all the Gallium drivers with configure
options compiled successfully with this change.
Thanks to Xavier Chantry <chantry.xavier@gmail.com> and
Michel Daenzer <michel@daenzer.net> for helping with this.
Signed-off-by: Luca Barbieri <luca@luca-barbieri.com>
Acked-by: Brian Paul <brian.e.paul@gmail.com>
Marek Olšák [Tue, 23 Mar 2010 12:33:16 +0000 (13:33 +0100)]
radeong: fix build issue with libdrm < 2.4.19
Dave Airlie [Mon, 22 Mar 2010 03:35:20 +0000 (13:35 +1000)]
r300g: fix glean occlusion query test
Chia-I Wu [Tue, 23 Mar 2010 06:37:24 +0000 (14:37 +0800)]
Add missing EGL files to the tarballs.
Add the Makefile of Gallium EGL drivers and demos using EGL to the
tarballs.
Kristian Høgsberg [Tue, 23 Mar 2010 01:57:26 +0000 (21:57 -0400)]
glx: Suppress BadDrawable from DRI2CopyRegion
This can happen when an X window is destroyed behind our back. We use
DRI2CopyRegion behind the scenes in many places (like flushing the fake
front to the real front) so we have to ignore X errors triggered in that
case.
The glean test cases trigger this consistently as they don't destroy the
GLX drawable nicely, they just destroy the X window.
Kristian Høgsberg [Tue, 23 Mar 2010 01:57:26 +0000 (21:57 -0400)]
glx: Suppress BadDrawable from DRI2CopyRegion
This can happen when an X window is destroyed behind our back. We use
DRI2CopyRegion behind the scenes in many places (like flushing the fake
front to the real front) so we have to ignore X errors triggered in that
case.
The glean test cases trigger this consistently as they don't destroy the
GLX drawable nicely, they just destroy the X window.
Corbin Simpson [Tue, 23 Mar 2010 01:12:16 +0000 (18:12 -0700)]
gallium/docs: Cleanup and clarify point ras info.
...This state's interdependent? Really? Needs moar cleanup.
Corbin Simpson [Tue, 23 Mar 2010 01:11:40 +0000 (18:11 -0700)]
radeong: Always initialize this variable.
May or may not be responsible for slight increases in ipers FPS.
Corbin Simpson [Mon, 22 Mar 2010 10:10:19 +0000 (03:10 -0700)]
r300g: Cleanup a few old warnings.
Those paths aren't important anymore, and a debugging warning won't stop
a hardlock anyway.
Ian Romanick [Tue, 23 Mar 2010 01:09:15 +0000 (18:09 -0700)]
mesa: set version string to 7.8-rc2
Jesse Barnes [Mon, 22 Mar 2010 23:39:11 +0000 (16:39 -0700)]
GLX/OML: honor OML semantics even if target, divisor and remainder are 0
This change passes a remainder of 1 to the server with the
DRI2SwapBuffers request, causing it to honor the OML semantics for the
swap rather than falling through to glXSwapBuffers behavior. The
remainder actually ends up ignored since the divisor is 0, but we need
to differentiate the OML and standard behavior somehow.
Reported-by: Mario Kleiner <mario.kleiner@tuebingen.mpg.de>
Signed-off-by: Jesse Barnes <jbarnes@virtuousgeek.org>
Eric Anholt [Mon, 22 Mar 2010 17:17:19 +0000 (10:17 -0700)]
i965: Add disasm for SNB MATH opcode.
Eric Anholt [Mon, 22 Mar 2010 16:04:25 +0000 (09:04 -0700)]
i965: Enable normal clipping on SNB.
Rejecting all doesn't seem to be helping get the pipeline lit up.
Eric Anholt [Sat, 20 Mar 2010 00:14:12 +0000 (17:14 -0700)]
i965: Force single program flow in SNB GS, to match gen4 GS.
projects / mesa.git / log