diff options
| author | Keith Whitwell <keithw@vmware.com> | 2010-04-09 13:33:57 +0100 |
|---|---|---|
| committer | Keith Whitwell <keithw@vmware.com> | 2010-04-09 13:33:57 +0100 |
| commit | efd402e13037e5c3e29759fa5b1c754c6d65d0e2 (patch) | |
| tree | ac0754b4a84f061f9c9b06f676298a33062f1537 /src/gallium/drivers/cell/ppu | |
| parent | fec8a1db13fac04ef56f6ece799d1f20aa3011db (diff) | |
| parent | 54526154c5b02be0fbae6b0dad766c6be1bee21c (diff) | |
Merge commit 'origin/master' into gallium-resources
Conflicts:
src/gallium/drivers/cell/ppu/cell_screen.c
src/gallium/drivers/cell/ppu/cell_texture.c
src/gallium/drivers/llvmpipe/lp_screen.c
src/gallium/drivers/r300/r300_context.c
src/gallium/drivers/r300/r300_render.c
src/gallium/drivers/r300/r300_screen.c
src/gallium/drivers/r300/r300_state.c
src/gallium/drivers/r300/r300_texture.c
src/gallium/drivers/r300/r300_transfer.c
src/gallium/state_trackers/egl/common/egl_g3d.h
src/gallium/state_trackers/egl/kms/native_kms.c
src/gallium/state_trackers/egl/x11/native_dri2.c
src/gallium/state_trackers/egl/x11/native_ximage.c
Diffstat (limited to 'src/gallium/drivers/cell/ppu')
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_screen.c | 4 | ||||
| -rw-r--r-- | src/gallium/drivers/cell/ppu/cell_texture.c | 2 |
2 files changed, 1 insertions, 5 deletions
diff --git a/src/gallium/drivers/cell/ppu/cell_screen.c b/src/gallium/drivers/cell/ppu/cell_screen.c index c4370ec3668..b4fd8d7235c 100644 --- a/src/gallium/drivers/cell/ppu/cell_screen.c +++ b/src/gallium/drivers/cell/ppu/cell_screen.c @@ -139,10 +139,6 @@ cell_is_format_supported( struct pipe_screen *screen, { struct sw_winsys *winsys = cell_screen(screen)->winsys; - if (format == PIPE_FORMAT_DXT5_RGBA || - format == PIPE_FORMAT_A8B8G8R8_SRGB) - return FALSE; - if (tex_usage & (PIPE_BIND_DISPLAY_TARGET | PIPE_BIND_SCANOUT | PIPE_BIND_SHARED)) { diff --git a/src/gallium/drivers/cell/ppu/cell_texture.c b/src/gallium/drivers/cell/ppu/cell_texture.c index 48e0dc3f41a..8a379154d1b 100644 --- a/src/gallium/drivers/cell/ppu/cell_texture.c +++ b/src/gallium/drivers/cell/ppu/cell_texture.c @@ -105,7 +105,7 @@ cell_displaytarget_layout(struct pipe_screen *screen, /* Round up the surface size to a multiple of the tile size? */ ct->dt = winsys->displaytarget_create(winsys, - ct->base->bind, + ct->base.bind, ct->base.format, ct->base.width0, ct->base.height0, |