Dave Airlie
f8ea531820
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 >
2009-11-20 11:47:00 +10:00
Vinson Lee
8b808d50e2
st/xorg: Fix infinite loop in copy_packed_data.
2009-11-19 14:40:00 -08:00
Brian Paul
4e6c79ac16
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.
2009-11-19 15:18:23 -07:00
Brian Paul
2198497203
vbo: added recursion check in vbo_exec_FlushVertices()
2009-11-19 15:17:56 -07:00
Brian Paul
dc41d62250
st/mesa: get rid of compressed_num_bytes() code
2009-11-19 14:35:38 -07:00
Brian Paul
92863109af
st/mesa: remove is_compressed_mesa_format()
2009-11-19 14:17:31 -07:00
Brian Paul
273f4d6b5f
st/mesa: remove pointless assertion
2009-11-19 14:17:31 -07:00
Brian Paul
3f40166500
softpipe: whitespace/indentation fixes
2009-11-19 14:17:31 -07:00
Brian Paul
367cfca808
softpipe: add missing check in softpipe_is_texture_referenced()
...
Check if the named texture is referenced by the texture cache.
2009-11-19 11:39:24 -07:00
Michel Dänzer
31ea323b4d
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.
2009-11-19 17:52:55 +01:00
Michel Dänzer
10c67f9381
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.
2009-11-19 17:47:21 +01:00
Michel Dänzer
34145fc3b7
st/xorg: Try harder to ensure a shared texture has valid contents right away.
2009-11-19 17:30:32 +01:00
Michel Dänzer
012d0193cc
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.
2009-11-19 17:25:05 +01:00
Michel Dänzer
10dbdee056
st/xorg: Remove superfluous flushes from the EXA WaitMarker hook.
...
Thanks to Thomas Hellström for pointing this out.
2009-11-19 10:54:49 +01:00
Michel Dänzer
ea114345a6
st/xorg: Don't initialize non-existing fields.
2009-11-19 10:38:08 +01:00
Jakob Bornecrantz
e12c9a6f3a
st/xorg: Init all functions and fix spelling
2009-11-18 10:59:42 +01:00
Jakob Bornecrantz
9ab3c70f65
st/xorg: Make the #if more easier to read
2009-11-18 10:44:07 +01:00
Jakob Bornecrantz
e73553bff7
st/xorg: Use the correct DRI2BufferPtr struct on 1.6.4 servers
2009-11-18 10:44:07 +01:00
Maciej Cencora
3bf12c8bea
r300: allow disabling s3tc support if libtxc_dxtn is available
2009-11-18 22:19:25 +01:00
Maciej Cencora
cefee4e327
Merge branch 'radeon-texrewrite-clean' into mesa_7_7_branch
2009-11-18 22:09:33 +01:00
Maciej Cencora
7118db8700
r600: align for mipmap tree changes
2009-11-18 22:02:48 +01:00
Ian Romanick
70dca0c273
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.
2009-11-17 22:53:06 -08:00
Ian Romanick
5606dfb572
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
2009-11-17 16:25:38 -08:00
Ian Romanick
b43887cf7e
ARB_fbo: Enable extensions related to GL_ARB_framebuffer_object for GLX
2009-11-17 16:25:38 -08:00
Ian Romanick
4e7476f601
ARB_fbo: Add missing GLX render opcode for glFramebufferTextureLayerEXT
...
Also regenerate the GLX protocol files from this change.
2009-11-17 16:25:38 -08:00
Ian Romanick
5fbfd88338
Add missing XML files to API_XML
...
When the files missing from the list were modified, the generated files
weren't regenerated.
2009-11-17 16:25:38 -08:00
Ian Romanick
4d6ec21439
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.
2009-11-17 16:25:38 -08:00
Ian Romanick
7fd44005ae
ARB_fbo: Regenerate files from previous commits.
2009-11-17 16:25:37 -08:00
Ian Romanick
50b05e7c1f
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.
2009-11-17 16:25:37 -08:00
Ian Romanick
afab8d9958
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.
2009-11-17 16:25:37 -08:00
Ian Romanick
daad31d527
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.
2009-11-17 16:25:37 -08:00
Ian Romanick
b244b702b3
EXT_pds: Add GL_EXT_packed_depth_stencil
2009-11-17 16:25:37 -08:00
Ian Romanick
92b38bc305
EXT_fbo_blit: Add missing GLX protocol render opcode
2009-11-17 16:25:37 -08:00
Ian Romanick
30f09573ed
ARB_fbo: Add missing protocol "Get" information
2009-11-17 16:25:37 -08:00
Ian Romanick
c185ff96c9
ARB_fbo: Remove _EXT from enum names
2009-11-17 16:25:37 -08:00
Brian Paul
a54033bedb
mesa: remove old comment
2009-11-17 16:18:29 -07:00
Brian Paul
133501bef2
mesa: fix assorted compiler warnings
2009-11-17 16:16:30 -07:00
Brian Paul
bc8fb028c6
mesa: fix incorrect type in store_texel_al1616()
2009-11-17 16:16:30 -07:00
Brian Paul
7e3955d8e8
i915g: replace //-style comments
2009-11-17 16:16:30 -07:00
Brian Paul
c4c11eb456
gallium/util: replace //-style comments
2009-11-17 16:16:30 -07:00
Brian Paul
845ddbc9aa
i915g: remove trailing commas in enum lists to silence warnings
2009-11-17 16:16:30 -07:00
Brian Paul
0422053eca
mesa: remove trailing comment to silence warning
2009-11-17 16:16:30 -07:00
Brian Paul
e36751ec81
mesa: remove a bit of old code
2009-11-17 16:16:30 -07:00
Maciej Cencora
afe84fa698
r200: align for mipmap tree changes
2009-11-17 19:46:59 +01:00
Maciej Cencora
93eb2ab8c3
radeon: align for mipmap tree changes
2009-11-17 19:46:37 +01:00
Jakob Bornecrantz
46492f11f6
svga: More -Werror removal
2009-11-17 12:09:19 +01:00
Jakob Bornecrantz
8c5a108dc3
svga: Remove -Werror for now as GCC 4.4.x raises a bunch of warnings
2009-11-17 11:24:39 +01:00
Maciej Cencora
aef769207d
r300: fix reads and writes for MESA_FORMAT_S8Z24 buffer
...
Regression was introduced by texformat-rework branch merge.
2009-11-17 13:40:43 -07:00
Patrice Mandin
b353106467
nouveau: nv30: Check for NULL front (happens with DRI2)
2009-11-17 19:50:37 +01:00
Patrice Mandin
49289f1d25
nouveau: nv30: Add missing include to fix warning
2009-11-17 19:49:56 +01:00
