diff options
| author | Keith Whitwell <keithw@vmware.com> | 2009-11-27 14:03:10 +0000 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2009-11-27 14:03:10 +0000 |
| commit | 6810ce005a067f20c04f0b3abd1e422adec71d28 (patch) | |
| tree | 2bc1382cdb8ce6283e5edc460551af075a31a7aa /src/gallium/state_trackers/xorg/xorg_renderer.c | |
| parent | 124ae596806f1a77af46f1f0e446d448da6e953a (diff) | |
Revert "st/xorg: fix composite after texture size changes"
This reverts commit 124ae596806f1a77af46f1f0e446d448da6e953a.
Pushed by mistake
Diffstat (limited to 'src/gallium/state_trackers/xorg/xorg_renderer.c')
| -rw-r--r-- | src/gallium/state_trackers/xorg/xorg_renderer.c | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_renderer.c b/src/gallium/state_trackers/xorg/xorg_renderer.c index 4f8985a75e..9cb65b0aac 100644 --- a/src/gallium/state_trackers/xorg/xorg_renderer.c +++ b/src/gallium/state_trackers/xorg/xorg_renderer.c @@ -313,25 +313,21 @@ setup_vertex_data_yuv(struct xorg_renderer *r, * these concepts are linked. */ void renderer_bind_destination(struct xorg_renderer *r, - struct pipe_surface *surface, - int width, - int height ) + struct pipe_surface *surface ) { struct pipe_framebuffer_state fb; struct pipe_viewport_state viewport; + int width = surface->width; + int height = surface->height; - /* Framebuffer uses actual surface width/height - */ memset(&fb, 0, sizeof fb); - fb.width = surface->width; - fb.height = surface->height; + fb.width = width; + fb.height = height; fb.nr_cbufs = 1; fb.cbufs[0] = surface; fb.zsbuf = 0; - /* Viewport sets us up to just touch the bit we're interested in: - */ viewport.scale[0] = width / 2.f; viewport.scale[1] = height / 2.f; viewport.scale[2] = 1.0; @@ -341,8 +337,6 @@ void renderer_bind_destination(struct xorg_renderer *r, viewport.translate[2] = 0.0; viewport.translate[3] = 0.0; - /* Constant buffer set up to match viewport dimensions: - */ if (r->fb_width != width || r->fb_height != height) { |