OSDN Git Service
Vinson Lee [Fri, 20 Nov 2009 22:20:15 +0000 (14:20 -0800)]
gallium/util: Initialize variables in u_pack_color.h.
Jakob Bornecrantz [Wed, 18 Nov 2009 16:45:39 +0000 (17:45 +0100)]
st/xorg: Flush any pending operations on upload
Jakob Bornecrantz [Wed, 18 Nov 2009 16:38:49 +0000 (17:38 +0100)]
st/xorg: Unbind any textures in solid
Helps debuging with rbug
Alan Hourihane [Fri, 20 Nov 2009 18:09:10 +0000 (18:09 +0000)]
Fix vega compilation.
Alan Hourihane [Fri, 20 Nov 2009 18:08:29 +0000 (18:08 +0000)]
Fix memory leak.
Vinson Lee [Fri, 20 Nov 2009 21:09:42 +0000 (13:09 -0800)]
progs/xdemos: Silence unused value warnings in sharedtex_mt.c.
Vinson Lee [Fri, 20 Nov 2009 21:01:22 +0000 (13:01 -0800)]
progs/xdemos: Fix memory leak in glxinfo.c.
Vinson Lee [Fri, 20 Nov 2009 20:48:44 +0000 (12:48 -0800)]
progs/tests: Silence unused value warnings in sharedtex.c.
Eric Anholt [Fri, 20 Nov 2009 20:42:06 +0000 (21:42 +0100)]
mesa: Fix NULL deref in optimizer when NumInstructions == 0.
Bug #24984.
Vinson Lee [Fri, 20 Nov 2009 20:34:21 +0000 (12:34 -0800)]
progs/tests: Initialize variable in getprocaddress.c.
Vinson Lee [Fri, 20 Nov 2009 20:11:55 +0000 (12:11 -0800)]
progs/util: Exit RawImageGetData early if malloc fails.
Prevents a null pointer deference later on.
Vinson Lee [Fri, 20 Nov 2009 19:34:21 +0000 (11:34 -0800)]
progs/slang: Check for ftell failure in vstest.c.
Vinson Lee [Fri, 20 Nov 2009 19:22:13 +0000 (11:22 -0800)]
progs/util: Fix memory leak if malloc fails in RawImageOpen.
Vinson Lee [Fri, 20 Nov 2009 08:03:10 +0000 (00:03 -0800)]
st/xorg: Fix type of 'unknown'.
Vinson Lee [Fri, 20 Nov 2009 07:56:07 +0000 (23:56 -0800)]
progs/vpglsl: Fix psiz-mul.glsl compilation error on Mac OS.
Vinson Lee [Fri, 20 Nov 2009 06:59:01 +0000 (22:59 -0800)]
progs/vp: Fix memory leak in vp-tris.c.
Vinson Lee [Fri, 20 Nov 2009 06:52:05 +0000 (22:52 -0800)]
progs/trivial: Redraw upon keypress.
Vinson Lee [Fri, 20 Nov 2009 06:46:19 +0000 (22:46 -0800)]
progs/glsl: Redraw upon keypress.
Dave Airlie [Fri, 20 Nov 2009 01:45:43 +0000 (11:45 +1000)]
r100: fix texture_from_pixmap and compiz.
r100 state emission has separate rect and non-rect states,
if we are doing TFP for a TEXTURE_2D we shouldn't use the rect
states as they won't get emitted properly.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Vinson Lee [Thu, 19 Nov 2009 22:38:39 +0000 (14:38 -0800)]
st/xorg: Fix infinite loop in copy_packed_data.
Vinson Lee [Thu, 19 Nov 2009 22:20:26 +0000 (14:20 -0800)]
progs/xdemos: Add missing break statement in offset.c.
Brian Paul [Thu, 19 Nov 2009 22:18:17 +0000 (15:18 -0700)]
st/mesa: replace st_flush() with pipe->flush()
We only need to flush the gallium driver in this case.
Fixes a recursive state validation bug.
Brian Paul [Thu, 19 Nov 2009 22:17:56 +0000 (15:17 -0700)]
vbo: added recursion check in vbo_exec_FlushVertices()
Brian Paul [Thu, 19 Nov 2009 21:35:38 +0000 (14:35 -0700)]
st/mesa: get rid of compressed_num_bytes() code
Brian Paul [Thu, 19 Nov 2009 21:17:09 +0000 (14:17 -0700)]
st/mesa: remove is_compressed_mesa_format()
Brian Paul [Thu, 19 Nov 2009 21:10:57 +0000 (14:10 -0700)]
st/mesa: remove pointless assertion
Brian Paul [Thu, 19 Nov 2009 21:02:06 +0000 (14:02 -0700)]
softpipe: whitespace/indentation fixes
Vinson Lee [Thu, 19 Nov 2009 21:03:12 +0000 (13:03 -0800)]
progs/trivial: Redraw upon keypress.
Brian Paul [Thu, 19 Nov 2009 18:37:50 +0000 (11:37 -0700)]
softpipe: add missing check in softpipe_is_texture_referenced()
Check if the named texture is referenced by the texture cache.
Michel Dänzer [Thu, 19 Nov 2009 16:52:55 +0000 (17:52 +0100)]
st/xorg: Replace compile-time acceleration switch with Option "2DAccel".
This option can be used to disable 2D acceleration. DRI2 and XVideo blits will
still be accelerated, at least to some degree even with compositing.
Michel Dänzer [Thu, 19 Nov 2009 16:47:21 +0000 (17:47 +0100)]
st/xorg: Miscellaneous XVideo fixes.
* Make sure the destination pixmap has a texture to render into.
* Fix damage reporting so the EXA migration code can do the right thing.
* Fix destination coordinates for redirected windows.
Michel Dänzer [Thu, 19 Nov 2009 16:30:32 +0000 (17:30 +0100)]
st/xorg: Try harder to ensure a shared texture has valid contents right away.
Michel Dänzer [Thu, 19 Nov 2009 16:25:05 +0000 (17:25 +0100)]
st/xorg: Don't complain about convolution filter being 'unknown'.
Also add a newline to the complaint so it'll be a little less annoying if we
actually encounter an unknown filter value again.
Michel Dänzer [Thu, 19 Nov 2009 09:54:49 +0000 (10:54 +0100)]
st/xorg: Remove superfluous flushes from the EXA WaitMarker hook.
Thanks to Thomas Hellström for pointing this out.
Michel Dänzer [Thu, 19 Nov 2009 09:38:08 +0000 (10:38 +0100)]
st/xorg: Don't initialize non-existing fields.
Vinson Lee [Thu, 19 Nov 2009 01:30:50 +0000 (17:30 -0800)]
progs/tests: Fix memory leak in texdown.c if malloc fails.
Jakob Bornecrantz [Wed, 18 Nov 2009 22:50:26 +0000 (22:50 +0000)]
st/xorg: Init all functions and fix spelling
Vinson Lee [Wed, 18 Nov 2009 22:41:40 +0000 (14:41 -0800)]
progs/fp: Redraw upon keypress.
Jakob Bornecrantz [Wed, 18 Nov 2009 19:56:50 +0000 (19:56 +0000)]
st/xorg: Make the #if more easier to read
Jakob Bornecrantz [Wed, 18 Nov 2009 19:51:57 +0000 (19:51 +0000)]
st/xorg: Use the correct DRI2BufferPtr struct on 1.6.4 servers
Vinson Lee [Wed, 18 Nov 2009 22:02:20 +0000 (14:02 -0800)]
progs/glsl: Fix trirast GLSL compilation errors on Mac OS.
Vinson Lee [Wed, 18 Nov 2009 21:50:49 +0000 (13:50 -0800)]
progs/glsl: Fix noise GLSL compilation error on Mac OS.
Maciej Cencora [Wed, 18 Nov 2009 21:19:25 +0000 (22:19 +0100)]
r300: allow disabling s3tc support if libtxc_dxtn is available
Maciej Cencora [Wed, 18 Nov 2009 21:09:33 +0000 (22:09 +0100)]
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
Maciej Cencora [Wed, 18 Nov 2009 21:02:48 +0000 (22:02 +0100)]
r600: align for mipmap tree changes
Vinson Lee [Wed, 18 Nov 2009 20:49:31 +0000 (12:49 -0800)]
progs/glsl: Fix multinoise GLSL compilation errors on Mac OS.
Vinson Lee [Wed, 18 Nov 2009 07:15:25 +0000 (23:15 -0800)]
progs/glsl: Fix mandelbrot GLSL compilation error on Mac OS.
Ian Romanick [Wed, 18 Nov 2009 06:53:06 +0000 (22:53 -0800)]
AL1616: Fix cut-and-paste bug
One of the PACK_COLOR_88 cases was left over from copying
_mesa_texstore_al88 to _mesa_texstore_al1616.
Brian Paul [Wed, 18 Nov 2009 02:22:29 +0000 (19:22 -0700)]
progs/glsl: use ShadersSupported()
Brian Paul [Wed, 18 Nov 2009 02:22:11 +0000 (19:22 -0700)]
progs/util: warn when GLSL not supported
Ian Romanick [Wed, 18 Nov 2009 00:10:24 +0000 (16:10 -0800)]
Merge branch 'outputswritten64'
Add a GLbitfield64 type and several macros to operate on 64-bit
fields. The OutputsWritten field of gl_program is changed to use that
type. This results in a fair amount of fallout in drivers that use
programs.
No changes are strictly necessary at this point as all bits used are
below the 32-bit boundary. Fairly soon several bits will be added for
clip distances written by a vertex shader. This will cause several
bits used for varyings to be pushed above the 32-bit boundary. This
will affect any drivers that support GLSL.
At this point, only the i965 driver has been modified to support this
eventuality.
I did this as a "squash" merge. There were several places through the
outputswritten64 branch where things were broken. I foresee this
causing difficulties later for bisecting. The history is still
available in the branch.
Conflicts:
src/mesa/drivers/dri/i965/brw_wm.h
Ian Romanick [Thu, 12 Nov 2009 21:28:12 +0000 (13:28 -0800)]
ARB_fbo: Enable extensions related to GL_ARB_framebuffer_object for GLX
Ian Romanick [Thu, 12 Nov 2009 21:22:12 +0000 (13:22 -0800)]
ARB_fbo: Add missing GLX render opcode for glFramebufferTextureLayerEXT
Also regenerate the GLX protocol files from this change.
Ian Romanick [Thu, 12 Nov 2009 19:59:35 +0000 (11:59 -0800)]
Add missing XML files to API_XML
When the files missing from the list were modified, the generated files
weren't regenerated.
Ian Romanick [Wed, 11 Nov 2009 23:33:23 +0000 (15:33 -0800)]
ARB_fbo: Enable GL_EXT_framebuffer_multisample
All of this functionality is already included in ARB_fbo. This just
enables the string.
I was a bit lazy in using FEATURE_ARB_framebuffer_object for this
feature as well. I don't think it makes much difference in the long run.
Ian Romanick [Thu, 12 Nov 2009 19:50:28 +0000 (11:50 -0800)]
ARB_fbo: Regenerate files from previous commits.
Ian Romanick [Wed, 11 Nov 2009 23:18:22 +0000 (15:18 -0800)]
ARB_fbo: Move EXT_fb_blit to EXT_framebuffer_object.xml
This extension is layered on GL_EXT_framebuffer_object, so it should
live in the same XML file.
Ian Romanick [Wed, 11 Nov 2009 23:15:35 +0000 (15:15 -0800)]
ARB_fbo: Add GL_EXT_framebuffer_multisample
Add GL_EXT_framebuffer_multisample. Make
glRenderbufferStorageMultisampleEXT in GL_EXT_framebuffer_object alias
glRenderbufferStorageMultisample. Also add the missing GLX render
opcode to glRenderbufferStorageMultisample.
Since this extension is layered on GL_EXT_framebuffer_object, I put it
in EXT_framebuffer_object.xml.
Ian Romanick [Wed, 11 Nov 2009 23:09:44 +0000 (15:09 -0800)]
EXT_pds: Alias GL_NV_packed_depth_stencil to GL_EXT_packed_depth_stencil
GL_EXT_packed_depth_stencil is a functional superset of
GL_NV_packed_depth_stencil. If a driver enables EXT_pds, make NV_pds
available as well.
Ian Romanick [Wed, 11 Nov 2009 23:08:49 +0000 (15:08 -0800)]
EXT_pds: Add GL_EXT_packed_depth_stencil
Ian Romanick [Wed, 11 Nov 2009 23:01:25 +0000 (15:01 -0800)]
EXT_fbo_blit: Add missing GLX protocol render opcode
Ian Romanick [Wed, 11 Nov 2009 22:51:29 +0000 (14:51 -0800)]
ARB_fbo: Add missing protocol "Get" information
Ian Romanick [Wed, 11 Nov 2009 22:44:43 +0000 (14:44 -0800)]
ARB_fbo: Remove _EXT from enum names
Brian Paul [Tue, 17 Nov 2009 23:32:05 +0000 (16:32 -0700)]
docs: libGL documentation, from the xorg-docs tree
This is pretty old and needs some updating but might be useful or
interesting to some people.
Vinson Lee [Tue, 17 Nov 2009 23:24:40 +0000 (15:24 -0800)]
progs/tests: Fix memory leak in arbgpuprog.c.
Brian Paul [Tue, 17 Nov 2009 23:18:29 +0000 (16:18 -0700)]
mesa: remove old comment
Brian Paul [Tue, 17 Nov 2009 23:16:16 +0000 (16:16 -0700)]
mesa: fix assorted compiler warnings
Brian Paul [Tue, 17 Nov 2009 23:15:56 +0000 (16:15 -0700)]
mesa: fix incorrect type in store_texel_al1616()
Brian Paul [Tue, 17 Nov 2009 23:15:29 +0000 (16:15 -0700)]
i915g: replace //-style comments
Brian Paul [Tue, 17 Nov 2009 23:15:21 +0000 (16:15 -0700)]
gallium/util: replace //-style comments
Brian Paul [Tue, 17 Nov 2009 23:14:54 +0000 (16:14 -0700)]
i915g: remove trailing commas in enum lists to silence warnings
Brian Paul [Tue, 17 Nov 2009 23:14:20 +0000 (16:14 -0700)]
progs/xdemos: change //-style comments
Brian Paul [Tue, 17 Nov 2009 23:14:09 +0000 (16:14 -0700)]
progs/glsl: change //-style comments
Brian Paul [Tue, 17 Nov 2009 23:13:12 +0000 (16:13 -0700)]
progs/demos: silence warnings
Brian Paul [Tue, 17 Nov 2009 23:05:59 +0000 (16:05 -0700)]
mesa: remove trailing comment to silence warning
Brian Paul [Tue, 17 Nov 2009 23:05:24 +0000 (16:05 -0700)]
mesa: remove a bit of old code
Vinson Lee [Tue, 17 Nov 2009 22:22:35 +0000 (14:22 -0800)]
progs/slang: Fix potential null pointer dereference in cltest.c.
Vinson Lee [Tue, 17 Nov 2009 22:10:35 +0000 (14:10 -0800)]
progs/redbook: Fix memory leak in quadric.c.
Maciej Cencora [Tue, 17 Nov 2009 18:46:59 +0000 (19:46 +0100)]
r200: align for mipmap tree changes
Maciej Cencora [Tue, 17 Nov 2009 18:46:37 +0000 (19:46 +0100)]
radeon: align for mipmap tree changes
Jakob Bornecrantz [Tue, 17 Nov 2009 11:04:17 +0000 (12:04 +0100)]
svga: More -Werror removal
Vinson Lee [Tue, 17 Nov 2009 21:49:31 +0000 (13:49 -0800)]
progs/util: Fix memory leak if fopen fails in RawImageOpen.
Jakob Bornecrantz [Tue, 17 Nov 2009 08:07:15 +0000 (09:07 +0100)]
svga: Remove -Werror for now as GCC 4.4.x raises a bunch of warnings
Maciej Cencora [Tue, 17 Nov 2009 20:27:31 +0000 (21:27 +0100)]
r300: fix reads and writes for MESA_FORMAT_S8Z24 buffer
Regression was introduced by texformat-rework branch merge.
Brian Paul [Tue, 17 Nov 2009 20:39:13 +0000 (13:39 -0700)]
progs/xdemos: added -lX11 -lpthread for GNU gold linker
Vinson Lee [Tue, 17 Nov 2009 20:00:22 +0000 (12:00 -0800)]
progs/util: Fix memory leak if fread returns 0 in CompileShaderFile.
Brian Paul [Tue, 17 Nov 2009 19:47:12 +0000 (12:47 -0700)]
mesa: move -ansi -pedantic to CFLAGS
Vinson Lee [Tue, 17 Nov 2009 19:37:48 +0000 (11:37 -0800)]
progs/glsl: Change tangentAttrib from GLuint to GLint in bump.c.
tangentAtrrib is assigned the result of glGetAttribLocation.
The assertion 'assert(tangentAtrrib >= 0)' would be a no-op if
tangentAttrib is a GLuint.
Vinson Lee [Tue, 17 Nov 2009 19:04:24 +0000 (11:04 -0800)]
progs/util: Fix memory leak if malloc fails in tkRGBImageLoad.
Patrice Mandin [Tue, 17 Nov 2009 18:50:37 +0000 (19:50 +0100)]
nouveau: nv30: Check for NULL front (happens with DRI2)
Patrice Mandin [Tue, 17 Nov 2009 18:49:56 +0000 (19:49 +0100)]
nouveau: nv30: Add missing include to fix warning
Michel Dänzer [Tue, 17 Nov 2009 18:41:29 +0000 (19:41 +0100)]
Remove unconditional use of glibc specific bswap_16() macro.
Fixes unresolved symbol bswap_16 on non-glibc or little endian glibc platforms.
Brian Paul [Tue, 17 Nov 2009 18:23:03 +0000 (11:23 -0700)]
docs: list the new VMware SVGA Gallium driver in release notes
Dan Nicholson [Mon, 9 Nov 2009 13:51:23 +0000 (05:51 -0800)]
dri: Ensure subdirs have finished before linking driver
Recursive make is hard. If there are subdirectories in the DRI drivers,
it's pretty certain we want to finish building in them before linking
the driver. Add a new target to serialize the rules.
Signed-off-by: Dan Nicholson <dbn.lists@gmail.com>
Vinson Lee [Tue, 17 Nov 2009 18:11:50 +0000 (10:11 -0800)]
progs/util: Fix memory leak if LoadRGBImage fails.
Michel Dänzer [Tue, 17 Nov 2009 18:02:03 +0000 (19:02 +0100)]
r600: More span breakage fixes.
At least now the compiler doesn't complain about implicitly declared functions
anymore...
Vinson Lee [Tue, 17 Nov 2009 17:53:19 +0000 (09:53 -0800)]
progs/glsl: Fix memory leak in deriv.c.
Michel Dänzer [Tue, 17 Nov 2009 17:47:24 +0000 (18:47 +0100)]
r600: Attempt to fix span breakage introduced by big endian fixes.
Only compile tested; I happened to notice people on IRC reporting
.../r600_dri.so: undefined symbol: radeon_ptr_2byte_8x2
Vinson Lee [Tue, 17 Nov 2009 16:29:36 +0000 (08:29 -0800)]
progs/util: Fix memory if LoadRGBMipmaps2 fails.
Michel Dänzer [Tue, 17 Nov 2009 07:05:24 +0000 (08:05 +0100)]
radeon: Depth/stencil span code fixes for big endian.
Fixes e.g. text in progs/demos/arbocclude.