summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZack Rusin <zackr@vmware.com>2009-09-09 11:35:34 -0400
committerZack Rusin <zackr@vmware.com>2009-09-10 17:21:06 -0400
commit16886c8be34fd17ed34c83ed2e83af2c825c989d (patch)
tree4d65d60d83b9785001270703137a14e686523c6c
parent6be1a98ab9d64584c3852b97e2f1d63697f7bf76 (diff)
st/xorg: disable solid fills until copies are accelerated as well
-rw-r--r--src/gallium/state_trackers/xorg/xorg_composite.c2
-rw-r--r--src/gallium/state_trackers/xorg/xorg_exa.c2
2 files changed, 3 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_composite.c b/src/gallium/state_trackers/xorg/xorg_composite.c
index 778a8a183e..dff51f220d 100644
--- a/src/gallium/state_trackers/xorg/xorg_composite.c
+++ b/src/gallium/state_trackers/xorg/xorg_composite.c
@@ -656,7 +656,7 @@ boolean xorg_solid_bind_state(struct exa_context *exa,
cso_set_vertex_shader_handle(exa->cso, shader.vs);
cso_set_fragment_shader_handle(exa->cso, shader.fs);
- return TRUE;
+ return FALSE;
}
void xorg_solid(struct exa_context *exa,
diff --git a/src/gallium/state_trackers/xorg/xorg_exa.c b/src/gallium/state_trackers/xorg/xorg_exa.c
index 1eed3d86f7..458ddb66bb 100644
--- a/src/gallium/state_trackers/xorg/xorg_exa.c
+++ b/src/gallium/state_trackers/xorg/xorg_exa.c
@@ -233,8 +233,10 @@ ExaDone(PixmapPtr pPixmap)
return;
exa->ctx->flush(exa->ctx, PIPE_FLUSH_RENDER_CACHE, &fence);
+#if 0
exa->ctx->screen->fence_finish(exa->ctx->screen, fence, 0);
exa->ctx->screen->fence_reference(exa->ctx->screen, &fence, NULL);
+#endif
if (priv->src_surf)
exa->scrn->tex_surface_destroy(priv->src_surf);