diff options
| author | Christoph Bumiller <[email protected]> | 2012-07-31 15:56:09 +0200 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2012-08-01 15:39:46 +0200 |
| commit | 6286d9810b7ebae588060370cd7a63c327478a2f (patch) | |
| tree | 615439a67beb92f629bfeffe27217257a94679c1 /src/gallium/include | |
| parent | be2dcc5e9f61d380aec93eeb01227cbb6b5037c1 (diff) | |
Revert "gallium: specify resource_resolve destination via a pipe_surface"
This reverts commit 5d5af7d359e0060fa00b90a8f04900b96f9058b0.
It turns out the issue this was supposed to fix merely counter-acted
a bug in the hardware driver that I wasn't aware of.
The resource_resolve is not supposed to do sRGB conversion, period.
(This would violate the requirement that source and destination must
be of the same format).
Diffstat (limited to 'src/gallium/include')
| -rw-r--r-- | src/gallium/include/pipe/p_state.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/gallium/include/pipe/p_state.h b/src/gallium/include/pipe/p_state.h index dbe726dbf9a..c828c806aef 100644 --- a/src/gallium/include/pipe/p_state.h +++ b/src/gallium/include/pipe/p_state.h @@ -572,7 +572,9 @@ struct pipe_draw_info struct pipe_resolve_info { struct { - struct pipe_surface *surface; + struct pipe_resource *res; + unsigned level; + unsigned layer; int x0; /**< always left */ int y0; /**< always top */ int x1; /**< determines scale if PIPE_CAP_SCALED_RESOLVE is supported */ @@ -585,7 +587,7 @@ struct pipe_resolve_info int x0; int y0; int x1; /**< may be < x0 only if PIPE_CAP_SCALED_RESOLVE is supported */ - int y1; /**< may be < y0 even if PIPE_CAP_SCALED_RESOLVE not supported */ + int y1; /**< may be < y1 even if PIPE_CAP_SCALED_RESOLVE not supported */ } src; unsigned mask; /**< PIPE_MASK_RGBA, Z, S or ZS */ |