OSDN Git Service
Brian Paul [Thu, 16 Apr 2009 15:25:52 +0000 (09:25 -0600)]
demos: use larger buffer for snprintf() call, see bug 21220
Keith Whitwell [Thu, 16 Apr 2009 11:19:19 +0000 (12:19 +0100)]
vbo: cache last dlist vertex in malloced memory
Avoids repeated mapping of the VBO buffer on display list replay. We
need access to the final vertex in order to update the GL current attrib
values.
José Fonseca [Thu, 16 Apr 2009 09:51:42 +0000 (10:51 +0100)]
Merge branch 'gallium-s3tc'
Jakob Bornecrantz [Wed, 15 Apr 2009 21:36:22 +0000 (23:36 +0200)]
progs/tests: Make texcompress2 get texture
Jakob Bornecrantz [Wed, 15 Apr 2009 21:33:07 +0000 (23:33 +0200)]
util: Fix surface usage
Brian Paul [Wed, 15 Apr 2009 15:54:04 +0000 (09:54 -0600)]
st: remove XXX comment
Brian Paul [Wed, 15 Apr 2009 15:52:04 +0000 (09:52 -0600)]
st: check for fast memcpy path in decompress_with_blit()
Brian Paul [Wed, 15 Apr 2009 15:51:38 +0000 (09:51 -0600)]
st: st_equal_formats() function to compare gallium/GL pixel formats
Brian Paul [Wed, 15 Apr 2009 15:37:22 +0000 (09:37 -0600)]
st: decompress_with_blit() path for glGetTexImage().
Decompress a texture by rendering a textured quad.
Brian Paul [Wed, 15 Apr 2009 15:36:03 +0000 (09:36 -0600)]
gallium: new, simple RGBA surface create/destroy helpers
Use these for quickly creating an RGBA drawing surface.
Thomas Hellstrom [Wed, 15 Apr 2009 15:22:40 +0000 (17:22 +0200)]
r300-gallium: Fixup for commit
9b75627fab5bf2ea90f27ddd31b60c54895f6de6.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Thomas Hellstrom [Wed, 15 Apr 2009 13:53:34 +0000 (15:53 +0200)]
gallium: Make sure we flush before some texture / buffer operations.
Also implement context member functions to optimize away those
flushes whenever possible.
Signed-off-by: Thomas Hellstrom <thellstrom-at-vmware-dot-com>
Brian Paul [Thu, 16 Apr 2009 01:55:00 +0000 (19:55 -0600)]
tests: another extended swizzle test
Corbin Simpson [Wed, 15 Apr 2009 22:09:43 +0000 (15:09 -0700)]
r300-gallium: Use viewport state.
Corbin Simpson [Wed, 15 Apr 2009 21:12:11 +0000 (14:12 -0700)]
r300-gallium: Don't use indexbufs for now.
They aren't working, so best to turn it off.
Corbin Simpson [Wed, 15 Apr 2009 20:25:20 +0000 (13:25 -0700)]
r300-gallium: Point size is at OVM position 15, not 1.
Or so sayeth osiris, and he would know. :3
Corbin Simpson [Wed, 15 Apr 2009 20:23:25 +0000 (13:23 -0700)]
r300-gallium: vs: Dot products.
Eric Anholt [Tue, 14 Apr 2009 23:31:26 +0000 (16:31 -0700)]
i965: Clean up output of WM SS state dump, and add format output.
Eric Anholt [Fri, 10 Apr 2009 01:31:59 +0000 (18:31 -0700)]
i915: Use DEBUG_WM (like 965) for printing the fragment program out.
This is nice when paired with INTEL_DEBUG=batch for debugging what's going
out to the hardware.
Eric Anholt [Fri, 10 Apr 2009 01:31:28 +0000 (18:31 -0700)]
i915: Add decode of dest buffer variables (destination format)
Eric Anholt [Fri, 10 Apr 2009 23:47:14 +0000 (16:47 -0700)]
mesa: Update texenv program when _NEW_ARRAYS is updated as well.
This fixes a regression in fbotest1 on 915, where a transition from
color+vertex array enabled to texcoord0+vertex array enabled wouldn't trigger
program update on the second _mesa_update_state of DrawArrays, and we'd sample
a constant texcoord of 0,0,0,1 instead of the array.
The double state update in DrawArrays from
1680ef869625dc1fe9cf481b180382a34e0738e7 still needs fixing.
Eric Anholt [Thu, 9 Apr 2009 18:03:03 +0000 (11:03 -0700)]
intel: Fix segfault when doing SW mipmap generation with a PBO texture upload.
Triggered in test-fbo from clutter since
37fb2d9b23eab5dbbb43a212c3475cb8016837d8.
José Fonseca [Wed, 15 Apr 2009 19:07:48 +0000 (20:07 +0100)]
mesa: TGSI translation of multiple render targets.
Brian Paul [Wed, 15 Apr 2009 14:01:01 +0000 (08:01 -0600)]
glx: added null pointer check in glXGetFBConfigs()
Fixes segfault seen with glxinfo with NVIDIA OpenGL.
Brian Paul [Wed, 15 Apr 2009 02:00:28 +0000 (20:00 -0600)]
mesa: remove unused matrixType param from ctx->Driver.UniformMatrix() functions
Brian Paul [Wed, 15 Apr 2009 01:56:59 +0000 (19:56 -0600)]
mesa: move #define for GL_PROGRAM_BINARY_LENGTH_OES
Brian Paul [Wed, 15 Apr 2009 01:53:37 +0000 (19:53 -0600)]
mesa: remove NV vertex/fragment program print/debug code
The code in prog_print.c can be used instead.
Brian Paul [Wed, 15 Apr 2009 01:44:16 +0000 (19:44 -0600)]
mesa: use standard offsetof() macro
Brian Paul [Tue, 14 Apr 2009 22:05:28 +0000 (16:05 -0600)]
i965: fix VS constant buffer reads
This mostly came down to finding the right MRF incantation in the
brw_dp_READ_4_vs() function.
Note: this feature is still disabled (but getting close to done).
Adam Jackson [Tue, 14 Apr 2009 21:56:29 +0000 (17:56 -0400)]
glx: Make glXGetScreenDriver() work for DRI2
José Fonseca [Tue, 14 Apr 2009 20:39:54 +0000 (21:39 +0100)]
scons: Support winddk 6001.18002.
José Fonseca [Tue, 14 Apr 2009 20:31:34 +0000 (21:31 +0100)]
scons: Recent Windows DDK do not include LIB.EXE.
Have to use LINK /LIB instead. The biggest problem is when the command
line is very long and all the options are included in a argument file --
link doesn't like if /LIB is included in the argument file.
José Fonseca [Tue, 14 Apr 2009 20:27:58 +0000 (21:27 +0100)]
mesa: Fix gcc assembly enable logic.
The i386 symbol is defined on WINDDK.
Ian Romanick [Sat, 11 Apr 2009 21:02:33 +0000 (14:02 -0700)]
DRI2: Don't fault on NULL DrawBuffer
It is possible for ctx->DrawBuffer to be NULL, so don't fault when
that happens. This change is not being committed to master because it
doesn't appear to be necessary there.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Cherry picked from mesa_7_4_branch, commit
49e0c74ddd91900fc4effb6d305d56e0563b456d
Brian Paul [Tue, 14 Apr 2009 17:08:42 +0000 (11:08 -0600)]
i965: checkpoint commit: VS constant buffers
Hook up a constant buffer, binding table, etc for the VS unit.
This will allow using large constant buffers with vertex shaders.
The new code is disabled at this time (use_const_buffer=FALSE).
Younes Manton [Tue, 14 Apr 2009 01:24:44 +0000 (21:24 -0400)]
dri glx: Swap before checking for cliprects.
We don't update drawables anymore unless they are completely
uninitialized, so we need to swap even if we don't have
cliprects yet, otherwise we never end up calling the driver's
SwapBuffers(). The driver should update the drawable in its
SwapBuffers() anyway.
See
8e753d04045a82062ac34d3b2622eb9dba8af374,
"dri glx: Fix dri_util::driBindContext" for the change that
exposed it.
Ben Skeggs [Mon, 13 Apr 2009 04:41:06 +0000 (14:41 +1000)]
nv50: fix mrt clear
Corbin Simpson [Sat, 11 Apr 2009 01:34:55 +0000 (18:34 -0700)]
r300-gallium: Split up vertex format tallying for HW and SW TCL.
This makes things draw (again) with HW TCL. Yay?
Corbin Simpson [Sat, 11 Apr 2009 01:15:46 +0000 (18:15 -0700)]
r300-gallium: Finish up cleanup of vertex format state.
This makes texcoords route properly, and also fixes a few asserts.
Corbin Simpson [Fri, 10 Apr 2009 23:14:12 +0000 (16:14 -0700)]
r300-gallium: Clean up vertex format setup.
Brian Paul [Fri, 10 Apr 2009 19:32:04 +0000 (13:32 -0600)]
i965: remove unused var
Brian Paul [Fri, 10 Apr 2009 19:21:27 +0000 (13:21 -0600)]
i965: clean-up in prepare_wm_surfaces()
Brian Paul [Fri, 10 Apr 2009 17:17:35 +0000 (11:17 -0600)]
mesa: reduce makefile output
José Fonseca [Fri, 10 Apr 2009 18:48:59 +0000 (19:48 +0100)]
wgl: Protect the framebuffer with a lock.
Unfortunately this doesn't catch all the cases, as the mesa state tracker
can still use the framebuffer without giving the wgl state tracker
the chance to lock it.
José Fonseca [Fri, 10 Apr 2009 17:43:51 +0000 (18:43 +0100)]
wgl: Note down the gallium pixel formats, instead of re-guessing them.
José Fonseca [Fri, 10 Apr 2009 17:14:22 +0000 (18:14 +0100)]
wgl: Query the screen for supported formats.
José Fonseca [Fri, 10 Apr 2009 16:22:21 +0000 (17:22 +0100)]
wgl: Walk through the pixel formats combinations.
José Fonseca [Fri, 10 Apr 2009 15:37:15 +0000 (16:37 +0100)]
wgl: Keep copies of the PIXELFORMATDESCRIPTOR structures.
Robert Noland [Fri, 10 Apr 2009 16:41:27 +0000 (11:41 -0500)]
Build dri drivers for powerpc and sparc on FreeBSD.
Brian Paul [Fri, 10 Apr 2009 14:56:03 +0000 (08:56 -0600)]
mesa: asst. progs/test/Makefile files
Brian Paul [Fri, 10 Apr 2009 14:36:04 +0000 (08:36 -0600)]
i965: added null const_buffer pointer check in update_constant_buffer()
Brian Paul [Fri, 10 Apr 2009 14:35:21 +0000 (08:35 -0600)]
intel: added screen->dri2.loader null pointer check in intel_flush()
Fixes segfaults when rendering to front buffer.
Brian Paul [Fri, 10 Apr 2009 14:05:10 +0000 (08:05 -0600)]
gallium: remove pipe_texture::compressed field
The format field encodes compressed vs. uncompressed already. We can easily
check if a texture is compressed with pf_is_compressed(texture->format).
José Fonseca [Fri, 10 Apr 2009 12:18:14 +0000 (13:18 +0100)]
wgl: Slightly simplify pixelformat creation.
José Fonseca [Fri, 10 Apr 2009 12:08:57 +0000 (13:08 +0100)]
progs: Port glxinfo to wgl.
José Fonseca [Fri, 10 Apr 2009 11:58:05 +0000 (12:58 +0100)]
mesa: Don't define WGL_ARB_extensions_string in mesa_wgl.h.
It breaks wglext.h as it doesn't define PFNWGLGETEXTENSIONSSTRINGARBPROC.
José Fonseca [Fri, 10 Apr 2009 09:30:14 +0000 (10:30 +0100)]
wgl: Move pixel format information into device structure.
José Fonseca [Fri, 10 Apr 2009 09:14:13 +0000 (10:14 +0100)]
wgl: Combine alpha pixelformat info in color.
José Fonseca [Fri, 10 Apr 2009 09:04:31 +0000 (10:04 +0100)]
stw: Reorder the pixelformats, so that no alpha pixelformats get chosen before alpha.
Some applications might not handle a alpha visual when when they did not
request for one.
José Fonseca [Fri, 10 Apr 2009 09:02:58 +0000 (10:02 +0100)]
stw: Don't make assumptions about integer size.
José Fonseca [Fri, 10 Apr 2009 09:02:29 +0000 (10:02 +0100)]
stw: Free the mesa framebuffer.
Michal Krol [Fri, 10 Apr 2009 09:58:49 +0000 (11:58 +0200)]
tgsi/sse2: Cleanup NRM/NRM4 implementation.
Fix comments.
Make sure .w is set to 1.0 for NRM.
Optimise for non-.xyzw writemasks.
Michal Krol [Fri, 10 Apr 2009 07:00:57 +0000 (09:00 +0200)]
rtasm: Silence `static function not used' warning.
Michal Krol [Fri, 10 Apr 2009 06:59:20 +0000 (08:59 +0200)]
draw: Silence pointer-to-integer cast warning.
Michal Krol [Fri, 10 Apr 2009 06:54:47 +0000 (08:54 +0200)]
draw: Fix vertex_header initialisation.
Brian Paul [Thu, 9 Apr 2009 21:31:48 +0000 (15:31 -0600)]
swrast: remove some unneeded CHAN_TYPE!=GL_FLOAT code
Brian Paul [Fri, 10 Apr 2009 00:40:24 +0000 (18:40 -0600)]
gallium: comments for surface_copy(), surface_fill() in p_context.h
Brian Paul [Fri, 10 Apr 2009 00:37:03 +0000 (18:37 -0600)]
i965: re-org of some of the new constant buffer code
Plus, begin the new code for vertex shader const buffers.
Brian Paul [Thu, 9 Apr 2009 23:04:58 +0000 (17:04 -0600)]
demos: fix aspect ratio in Reshape()
Brian Paul [Thu, 9 Apr 2009 23:04:09 +0000 (17:04 -0600)]
i965: new SURF_INDEX_ macros
Used to map drawables, textures and constant buffers to surface binding
table indexes.
Brian Paul [Thu, 9 Apr 2009 22:10:43 +0000 (16:10 -0600)]
gallium: change // comment to /* */ style
Brian Paul [Thu, 9 Apr 2009 22:02:41 +0000 (16:02 -0600)]
gallium: updated comments in p_screen.h
Brian Paul [Thu, 9 Apr 2009 21:09:42 +0000 (15:09 -0600)]
i965simple: remove pipe_texture::compressed reference
Michal Krol [Thu, 9 Apr 2009 21:24:57 +0000 (23:24 +0200)]
tgsi/sse2: Fix build.
Michal Krol [Thu, 9 Apr 2009 21:17:02 +0000 (23:17 +0200)]
draw: Fix LIT instruction.
Ian Romanick [Tue, 7 Apr 2009 18:23:10 +0000 (11:23 -0700)]
intel / DRI2: Accept fake front-buffer from loader
Handle the loader returning a fake front-buffer. Since the driver
never specifically requests a fake front-buffer, the driver assumes
that it will never receive both a fake and a real front-buffer.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Ian Romanick [Mon, 6 Apr 2009 22:35:37 +0000 (15:35 -0700)]
DRI2: Assume that there is always a front buffer
Assume that the front-buffer exists even if the server didn't tell the
client that it exists.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Ian Romanick [Mon, 6 Apr 2009 20:15:54 +0000 (13:15 -0700)]
intel / DRI2: Track and flush front-buffer rendering
Track two flags: whether or not front-buffer rendering is currently
enabled and whether or not front-buffer rendering has been enabled
since the last glFlush. If the second flag is set, the front-buffer
is flushed via a loader call back. If the first flag is cleared, the
second flag is cleared at this time.
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
Ian Romanick [Mon, 6 Apr 2009 19:44:18 +0000 (12:44 -0700)]
DRI2: Provide an interface for drivers to flush front-buffer rendering
Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kristian Høgsberg <krh@redhat.com>
José Fonseca [Thu, 9 Apr 2009 21:10:45 +0000 (22:10 +0100)]
python: Fix bad pointer.
Brian Paul [Thu, 9 Apr 2009 21:00:54 +0000 (15:00 -0600)]
st: remove another unneeded 'is compressed' comparison
Brian Paul [Thu, 9 Apr 2009 20:58:40 +0000 (14:58 -0600)]
st: remove unneeded "is compressed" check
The format indicates compressed vs. uncompressed.
Brian Paul [Thu, 9 Apr 2009 20:57:41 +0000 (14:57 -0600)]
st: rearrange some code to be a little more clear
Brian Paul [Thu, 9 Apr 2009 20:55:32 +0000 (14:55 -0600)]
gallium: remove unneeded compressed=0 assignment
Brian Paul [Thu, 9 Apr 2009 20:55:19 +0000 (14:55 -0600)]
gallium: remove unneeded compressed=0 assignment
Brian Paul [Thu, 9 Apr 2009 20:48:21 +0000 (14:48 -0600)]
st: remove comp_byte parameter to st_texture_create()
We can determine if the texture is compressed by checking the format.
Brian Paul [Thu, 9 Apr 2009 20:41:49 +0000 (14:41 -0600)]
st: consolidate format->usage computation
Brian Paul [Thu, 9 Apr 2009 20:35:36 +0000 (14:35 -0600)]
st: add const qualifiers, use GL types
Brian Paul [Thu, 9 Apr 2009 20:32:42 +0000 (14:32 -0600)]
st: make loops over 3D texture slices a litte more intuitive
Brian Paul [Thu, 9 Apr 2009 20:27:36 +0000 (14:27 -0600)]
st: reformatting and clean-ups in texture code
Michal Krol [Thu, 9 Apr 2009 20:47:06 +0000 (22:47 +0200)]
tgsi/sse2: Fix ARL instruction.
Michal Krol [Thu, 9 Apr 2009 20:38:07 +0000 (22:38 +0200)]
tgsi/sse2: Fix LIT instruction.
José Fonseca [Thu, 9 Apr 2009 20:28:31 +0000 (21:28 +0100)]
trace: Dump the fence, not its pointer.
José Fonseca [Thu, 9 Apr 2009 20:27:43 +0000 (21:27 +0100)]
wgl: Remove unused member.
José Fonseca [Thu, 9 Apr 2009 20:27:03 +0000 (21:27 +0100)]
trace: Use 'flags' name consistently.
José Fonseca [Thu, 9 Apr 2009 20:26:15 +0000 (21:26 +0100)]
gallium: Use "flags" consistently.
José Fonseca [Thu, 9 Apr 2009 19:42:09 +0000 (20:42 +0100)]
gdi: Use stw_* names.
José Fonseca [Thu, 9 Apr 2009 19:41:59 +0000 (20:41 +0100)]
wgl: Use more stw_* names.
José Fonseca [Thu, 9 Apr 2009 19:35:55 +0000 (20:35 +0100)]
wgl: Use hooks instead of subclassing the window.
Subclassing the window is invasive: we might call an old window proc even
after it was removed. Glut and another bug just in the wrong time was
provoking this. Hooks don't have this problem.
Brian Paul [Thu, 9 Apr 2009 16:53:01 +0000 (10:53 -0600)]
mesa: fix potential recursive locking deadlock in _mesa_HashWalk()
If the walk callback called _mesa_HashRemove() we'd deadlock.