OSDN Git Service
Michal Krol [Wed, 10 Jun 2009 10:01:13 +0000 (12:01 +0200)]
winsys/gdi: Link to ws2_32 library.
Michal Krol [Wed, 10 Jun 2009 09:56:38 +0000 (11:56 +0200)]
trace: __func__ --> __FUNCTION__.
Eric Anholt [Tue, 9 Jun 2009 23:12:43 +0000 (16:12 -0700)]
i915: Add an option for testing the effect of early Z in classic mode.
The early Z stuff is supposed to be unsafe without some more work in the
enable/disable path (in particular, how do we want to get it disabled on
the way out to the X Server?), but at the moment is 6% in OA.
Eric Anholt [Sat, 6 Jun 2009 07:22:00 +0000 (07:22 +0000)]
intel: Remove an unneeded hunk that slipped in with texture tiling.
intel_miptree_pitch_align does this later on.
Eric Anholt [Sat, 6 Jun 2009 00:52:21 +0000 (00:52 +0000)]
intel: Base tri clearing depth on Y tiling, not IS_I965().
Y tiling is why the 965 check was there, but I wanted to experiment with Y
on pre-965 as well.
Eric Anholt [Fri, 5 Jun 2009 15:14:15 +0000 (15:14 +0000)]
intel: Fix intel_region_unmap to do unmap, not map.
Thanks to Shuang He for catching this.
Brian Paul [Tue, 9 Jun 2009 21:07:39 +0000 (15:07 -0600)]
i965: added intelFlush() call in intel_get_tex_image()
Fixes the render-to-texture test in progs/tests/getteximage.c
Brian Paul [Tue, 9 Jun 2009 21:06:41 +0000 (15:06 -0600)]
tests: check for GL_EXT/ARB_framebuffer_object
Brian Paul [Tue, 9 Jun 2009 21:05:36 +0000 (15:05 -0600)]
tests: also test glGetTexImage with render to texture
Also, adjust texture dims for the original test.
And use GLEW.
Brian Paul [Tue, 9 Jun 2009 20:03:25 +0000 (14:03 -0600)]
tests: quick and dirty glGetTexImage() test program
Brian Paul [Tue, 9 Jun 2009 19:28:20 +0000 (13:28 -0600)]
intel: use GLboolean, not int, for compressed parameter
Brian Paul [Tue, 9 Jun 2009 19:21:22 +0000 (13:21 -0600)]
intel: make a bunch of glTexImage-related functions static
Brian Paul [Tue, 9 Jun 2009 19:09:05 +0000 (13:09 -0600)]
intel: whitespace clean-ups
Brian Paul [Tue, 9 Jun 2009 18:17:19 +0000 (12:17 -0600)]
vbo: more glDrawElements debug code (disabled)
Brian Paul [Tue, 9 Jun 2009 17:53:19 +0000 (11:53 -0600)]
mesa: added a simple bounds checker to glMap/UnmapBuffer() (disabled)
Jakob Bornecrantz [Tue, 9 Jun 2009 18:24:06 +0000 (19:24 +0100)]
trace/rbug: Add support for draw block rule
Jakob Bornecrantz [Tue, 9 Jun 2009 18:22:40 +0000 (19:22 +0100)]
rbug: Change block protocol around a bit
Jakob Bornecrantz [Tue, 9 Jun 2009 14:59:29 +0000 (15:59 +0100)]
trace/rbug: Return textures currently bound to context
Jakob Bornecrantz [Tue, 9 Jun 2009 14:58:14 +0000 (15:58 +0100)]
rbug: Extend context info and block ops
Brian Paul [Mon, 8 Jun 2009 20:41:54 +0000 (14:41 -0600)]
intel: remove extra \n from warning string
Brian Paul [Mon, 8 Jun 2009 21:27:10 +0000 (15:27 -0600)]
mesa: reorder fields, update comments for gl_buffer_object
Michal Krol [Tue, 9 Jun 2009 10:14:40 +0000 (12:14 +0200)]
glsl: Expand nested preprocessor macros.
Corbin Simpson [Tue, 9 Jun 2009 03:23:34 +0000 (20:23 -0700)]
r300-gallium: HW TCL glxgears. (Read the rest of the log.)
Um. So, yeah. Two massive WTF moments here. The first one is that, somehow,
I never actually hooked up vertex shader emission, so the only time that the
VAP gets set up is during surface_copy/surface_fill. That's why acidgears
was happening.
The second one is that, somehow, once I actually hooked it up, glxgears just
magically worked. Without any actual, real testing, I somehow accidentally
made the shader compiler work. Go figure.
Corbin Simpson [Tue, 9 Jun 2009 03:01:57 +0000 (20:01 -0700)]
r300-gallium: Make UCP and clip work again for SW TCL.
SW TCL: tri-clip works, tri-userclip works
HW TCL: tri-clip fails, tri-userclip works
That is a 200% improvement over the previous situation. Woot.
Corbin Simpson [Tue, 9 Jun 2009 02:55:33 +0000 (19:55 -0700)]
r300-gallium: Don't emit UCP planes for SW TCL.
Michal Krol [Mon, 8 Jun 2009 18:52:47 +0000 (20:52 +0200)]
glsl: Fix preprocessor define argument parsing for dead sections.
Brian Paul [Mon, 8 Jun 2009 16:58:04 +0000 (10:58 -0600)]
glsl: preprocessor debug code (disabled)
Brian Paul [Mon, 8 Jun 2009 16:56:51 +0000 (10:56 -0600)]
docs: document MESA_EXTENSION_OVERRIDE env var
Brian Paul [Mon, 8 Jun 2009 16:55:34 +0000 (10:55 -0600)]
softpipe: advertise PIPE_CAP_MAX_TEXTURE_ANISOTROPY as 16.0
Note that this doesn't have any real significance since
PIPE_CAP_ANISOTROPIC_FILTER still returns 0.
Brian Paul [Mon, 8 Jun 2009 16:52:16 +0000 (10:52 -0600)]
mesa: new MESA_EXTENSION_OVERRIDE env var
Can be used to enable/disable extensions as reported by
glGetString(GL_EXTENSIONS).
If a name is preceeded by '-' it's disabled. Otherwise, the named
extension is enabled.
Intended for debug/test purposes.
Maciej Cencora [Mon, 8 Jun 2009 13:23:56 +0000 (07:23 -0600)]
mesa: EXT_vertex_array_bgra fixes
1) Pass the correct format when calling update_array in
_mesa_VertexAttribPointerARB.
2) glVertexAttribPointerNV accepts GL_BGRA format too.
3) raise INVALID_VALUE error when format is BGRA and normalized is
false in glVertexAttribPointerARB
Jakob Bornecrantz [Mon, 8 Jun 2009 12:33:55 +0000 (14:33 +0200)]
trace/rbug: Sleep on windows when blocked
Dave Airlie [Mon, 8 Jun 2009 08:17:21 +0000 (18:17 +1000)]
llvm: fix compile on gcc 4.4
Ben Skeggs [Sun, 7 Jun 2009 09:29:29 +0000 (19:29 +1000)]
nouveau: forgotten makefile...
Ben Skeggs [Sat, 6 Jun 2009 04:00:45 +0000 (14:00 +1000)]
nv50: fix multi-texturing
Ben Skeggs [Sat, 6 Jun 2009 00:57:19 +0000 (10:57 +1000)]
nv50: support non-normalized texture coords
Corbin Simpson [Fri, 5 Jun 2009 20:46:59 +0000 (13:46 -0700)]
r300-gallium: Use VAP_CLIP_CNTL.
Makes tri-userclip work with HW TCL.
Corbin Simpson [Fri, 5 Jun 2009 18:21:09 +0000 (11:21 -0700)]
r300-gallium: Emit UCP.
Corbin Simpson [Fri, 5 Jun 2009 17:18:20 +0000 (10:18 -0700)]
r300-gallium: Improve vs emit.
Michal Krol [Fri, 5 Jun 2009 13:00:15 +0000 (15:00 +0200)]
mesa: Fix wglext.h prototypes.
Ben Skeggs [Fri, 5 Jun 2009 12:04:07 +0000 (22:04 +1000)]
nv50: use larger tile sizes
Ben Skeggs [Fri, 5 Jun 2009 10:45:58 +0000 (20:45 +1000)]
nv50: use nouveau_bo for query buffers
Ben Skeggs [Fri, 5 Jun 2009 10:32:32 +0000 (20:32 +1000)]
nv50: create textures with nouveau_bo, for flexibility with tiling later
Michal Krol [Fri, 5 Jun 2009 12:32:31 +0000 (14:32 +0200)]
util: Fix winsock include.
Corbin Simpson [Fri, 5 Jun 2009 07:12:26 +0000 (00:12 -0700)]
r300-gallium: Mute some debug info.
Most of it is no longer interesting.
Corbin Simpson [Fri, 5 Jun 2009 06:56:32 +0000 (23:56 -0700)]
r300-gallium: vs: Fix negation calculation.
Still doesn't draw right, but at least it's the right numbers now.
Thanks to taiu in #dri-devel.
Corbin Simpson [Fri, 5 Jun 2009 06:56:08 +0000 (23:56 -0700)]
r300-gallium: Fix pasta.
Trivial but annoying.
Corbin Simpson [Fri, 5 Jun 2009 06:25:46 +0000 (23:25 -0700)]
r300-gallium: Improve vs debug more.
Still not showing me why my stuff's failing, but getting there.
Corbin Simpson [Fri, 5 Jun 2009 05:41:33 +0000 (22:41 -0700)]
r300-gallium: vs: Add negation, SUB.
Doesn't work. WTF.
Corbin Simpson [Fri, 5 Jun 2009 04:38:33 +0000 (21:38 -0700)]
r300: Moar vs debug.
Ben Skeggs [Fri, 5 Jun 2009 04:48:45 +0000 (14:48 +1000)]
nouveau: plug in our map_buffer_range and friends
Ben Skeggs [Fri, 5 Jun 2009 02:27:42 +0000 (12:27 +1000)]
nouveau: fix build with libdrm_nouveau 0.6
Ben Skeggs [Fri, 5 Jun 2009 01:21:08 +0000 (11:21 +1000)]
nouveau: remove unneeded code from ws, use pipe_buffer_ instead of ws->
Ben Skeggs [Fri, 5 Jun 2009 00:28:13 +0000 (10:28 +1000)]
nouveau: move channel creation into pipe drivers
Ben Skeggs [Thu, 4 Jun 2009 22:47:42 +0000 (08:47 +1000)]
nouveau: call notifier/grobj etc funcs directly
libdrm_nouveau is linked with the winsys, there's no good reason to do all
this through yet another layer.
Ben Skeggs [Thu, 4 Jun 2009 11:57:53 +0000 (21:57 +1000)]
nv04: remove u_simple_screen usage
Ben Skeggs [Thu, 4 Jun 2009 11:53:57 +0000 (21:53 +1000)]
nv10: remove u_simple_screen usage
Ben Skeggs [Thu, 4 Jun 2009 11:44:20 +0000 (21:44 +1000)]
nv20: remove u_simple_screen usage
Ben Skeggs [Thu, 4 Jun 2009 11:37:59 +0000 (21:37 +1000)]
nv30: remove u_simple_screen usage
Ben Skeggs [Thu, 4 Jun 2009 11:30:41 +0000 (21:30 +1000)]
nv40: remove u_simple_screen usage
Ben Skeggs [Thu, 4 Jun 2009 00:19:04 +0000 (10:19 +1000)]
nouveau: add pipe_buffer/fence code to pipe drivers, move nv50 over
Ben Skeggs [Thu, 4 Jun 2009 06:13:56 +0000 (16:13 +1000)]
nouveau: pass nouveau_bo instead of pipe_buffer to so_ calls
Ben Skeggs [Thu, 4 Jun 2009 05:26:07 +0000 (15:26 +1000)]
nouveau: call nouveau_pushbuf directly rather than going through nvws
Dan Nicholson [Fri, 5 Jun 2009 02:42:08 +0000 (19:42 -0700)]
osmesa: Link with -ldl for dlopen code
Now that the dlopen wrappers are built into libmesa.a, we need to link
standalone libOSMesa with libdl to resolve dlopen and friends on
platforms that need it.
Dan Nicholson [Thu, 4 Jun 2009 13:21:10 +0000 (06:21 -0700)]
osmesa: Allow building standalone in all three channel widths
autoconf had been designating the 8 bit libOSMesa as the default
standalone osmesa, but the Makefile expected it to be linked to libGL.
Fix up the osmesa Makefile so that it allows any of the combinations of
standalone and channel width to be built.
Fixes bug #21980.
Jakob Bornecrantz [Fri, 5 Jun 2009 02:01:34 +0000 (03:01 +0100)]
trace/rbug: Use condvar on system that has it for blocking
Jakob Bornecrantz [Fri, 5 Jun 2009 01:57:19 +0000 (02:57 +0100)]
gallium: Make pipe thread say if it has condvars or not
Jakob Bornecrantz [Thu, 4 Jun 2009 22:40:10 +0000 (23:40 +0100)]
trace/rbug: Add new contexts functions to trace rbug
Jakob Bornecrantz [Thu, 4 Jun 2009 13:36:10 +0000 (14:36 +0100)]
rbug: Update rbug protocol with new context calls
Brian Paul [Thu, 4 Jun 2009 20:26:51 +0000 (14:26 -0600)]
mesa: call _mesa_ funcs, not gl funcs for debugging
Brian Paul [Thu, 4 Jun 2009 19:16:13 +0000 (13:16 -0600)]
Merge branch 'mesa_7_5_branch'
Conflicts:
src/mesa/main/context.c
Brian Paul [Thu, 4 Jun 2009 19:13:14 +0000 (13:13 -0600)]
softpipe: separate case for PIPE_PRIM_POLYGON in sp_vbuf_draw()
Because of flat shading, we can't use same code as PIPE_PRIM_TRIANGLE_FAN.
This is a follow-on to commit
a59575d8fbe8b0ca053cc8366ce7a42bc660158a.
(cherry picked from commit
086ecea179ed572c89aa77c5f465671a5cef87a7)
Brian Paul [Thu, 4 Jun 2009 19:12:13 +0000 (13:12 -0600)]
softpipe: fix incorrect tri vertex order for PIPE_PRIM_POLYGON rendering
This fixes incorrect front/back-face orientation.
(cherry picked from commit
a64bbdaa3e0b036a880d6db65ceb4a66205062f1)
Brian Paul [Thu, 4 Jun 2009 19:10:19 +0000 (13:10 -0600)]
st/mesa: increase ST_MAX_SHADER_TOKENS to 8k
Brian Paul [Thu, 4 Jun 2009 19:08:52 +0000 (13:08 -0600)]
tgsi: increase MAX_LABELS to 4096
Brian Paul [Thu, 4 Jun 2009 16:30:25 +0000 (10:30 -0600)]
mesa: update wglext.h to latest version
Brian Paul [Thu, 4 Jun 2009 16:29:44 +0000 (10:29 -0600)]
mesa: remove PFNGL typedefs that are in glext.h
Brian Paul [Thu, 4 Jun 2009 16:27:47 +0000 (10:27 -0600)]
mesa: upgrade glext.h to version 52
A number of the PFNGL* function typedefs are now in glext.h and must be
omitted from the gl.h file. gl.h will be pruned in the next commit.
Eric Anholt [Wed, 3 Jun 2009 16:40:20 +0000 (16:40 +0000)]
intel: Add support for tiled textures.
This is about a 30% performance win in OA with high settings on my GM45,
and experiments with 915GM indicate that it'll be around a 20% win there.
Currently, 915-class hardware is seriously hurt by the fact that we use
fence regs to control the tiling even for 3D instructions that could live
without them, so we spend a bunch of time waiting on previous rendering in
order to pull fences off. Thus, the texture_tiling driconf option defaults
off there for now.
Eric Anholt [Thu, 4 Jun 2009 10:21:29 +0000 (10:21 +0000)]
i915: Don't rely on fence regs when we don't have to.
We're on the way to telling the kernel about when we need fence regs on our
objects or not, and this will cut the number of places needing them.
Eric Anholt [Thu, 4 Jun 2009 09:40:44 +0000 (09:40 +0000)]
i915: Remove some long-dead i830 code.
Brian Paul [Thu, 4 Jun 2009 00:33:07 +0000 (18:33 -0600)]
softpipe: separate case for PIPE_PRIM_POLYGON in sp_vbuf_draw()
Because of flat shading, we can't use same code as PIPE_PRIM_TRIANGLE_FAN.
This is a follow-on to commit
a59575d8fbe8b0ca053cc8366ce7a42bc660158a.
Brian Paul [Thu, 4 Jun 2009 00:31:55 +0000 (18:31 -0600)]
softpipe: fix incorrect tri vertex order for PIPE_PRIM_POLYGON rendering
This fixes incorrect front/back-face orientation.
Brian Paul [Wed, 3 Jun 2009 23:09:03 +0000 (17:09 -0600)]
swrast: always do span clipping in _swrast_write_rgba_span()
It's possible for mis-behaving vertex programs to produce vertex data
with very large/NaN values. This doesn't get handled reliably by the
clipper code so we may try to rasterize triangles that extend beyond
the viewport/window. Always clip spans to avoid invalid memory accesses
later.
Brian Paul [Wed, 3 Jun 2009 23:05:37 +0000 (17:05 -0600)]
vbo: minor reformatting
Brian Paul [Wed, 3 Jun 2009 23:03:11 +0000 (17:03 -0600)]
vbo: move/refactor debug code
Brian Paul [Wed, 3 Jun 2009 22:59:44 +0000 (16:59 -0600)]
vbo: added debug code to check array data validity (disabled)
Brian Paul [Wed, 3 Jun 2009 21:46:56 +0000 (15:46 -0600)]
vbo: new debug/dump code (disabled)
Brian Paul [Wed, 3 Jun 2009 21:43:53 +0000 (15:43 -0600)]
mesa: added NaN checking code (disabled)
Brian Paul [Wed, 3 Jun 2009 21:42:52 +0000 (15:42 -0600)]
mesa: check/prevent NaN for EX2/LG2
Brian Paul [Wed, 3 Jun 2009 21:40:05 +0000 (15:40 -0600)]
tnl: updated clip debug code (disabled)
Brian Paul [Wed, 3 Jun 2009 21:38:57 +0000 (15:38 -0600)]
mesa: added buffer object debug code (disabled)
Brian Paul [Wed, 3 Jun 2009 21:36:24 +0000 (15:36 -0600)]
tnl: add some floating point sanity checks (disabled)
Brian Paul [Tue, 2 Jun 2009 15:16:33 +0000 (09:16 -0600)]
vbo: tweak out-of-bounds VBO access error message
Subtract 1 from _MaxElement to be clearer.
Ian Romanick [Wed, 3 Jun 2009 16:55:42 +0000 (17:55 +0100)]
Thank you git for doing the right thing.
Ian Romanick [Tue, 2 Jun 2009 17:33:55 +0000 (18:33 +0100)]
Fix compiling indirect.c when GLX_DIRECT_RENDERING is not defined
DO NOT HAND-EDIT GLX PROTOCOL FILES. Seriously. How can you miss the giant
comment at the top of the file?
Ian Romanick [Wed, 3 Jun 2009 16:49:05 +0000 (17:49 +0100)]
Fast path when rebinding the same texture in single context environment
If there is no shared context, there is no purpose in rebinding the same
texture. In some artificial tests this improves performance 10% - 30%.
Brian Paul [Wed, 3 Jun 2009 03:46:17 +0000 (21:46 -0600)]
st/mesa: minor clean-ups, reformatting, etc
Brian Paul [Wed, 3 Jun 2009 03:41:03 +0000 (21:41 -0600)]
docs: remove version info carried over from 7.5
Brian Paul [Wed, 3 Jun 2009 03:30:22 +0000 (21:30 -0600)]
docs: clarify GL_ARB_copy_buffer driver support