diff options
author | Axel Davy <[email protected]> | 2014-12-03 23:33:07 +0100 |
---|---|---|
committer | Emil Velikov <[email protected]> | 2015-01-22 22:16:19 +0000 |
commit | b0b5430322406a521b8a75468452ac5d4ce86750 (patch) | |
tree | 36a60016b826964ac486e792e121e358740866dc /src/gallium/state_trackers/nine/surface9.c | |
parent | 82810d3b660dfeef53a18c0d48914783e2999b2a (diff) |
st/nine: Check if srgb format is supported before trying to use it.
According to msdn, we must act as if user didn't ask srgb if we don't
support it.
Reviewed-by: Ilia Mirkin <[email protected]>
Reviewed-by: David Heidelberg <[email protected]>
Signed-off-by: Axel Davy <[email protected]>
Cc: "10.4" <[email protected]>
Diffstat (limited to 'src/gallium/state_trackers/nine/surface9.c')
-rw-r--r-- | src/gallium/state_trackers/nine/surface9.c | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/src/gallium/state_trackers/nine/surface9.c b/src/gallium/state_trackers/nine/surface9.c index e19d24ba209..59288927a84 100644 --- a/src/gallium/state_trackers/nine/surface9.c +++ b/src/gallium/state_trackers/nine/surface9.c @@ -150,14 +150,22 @@ struct pipe_surface * NineSurface9_CreatePipeSurface( struct NineSurface9 *This, const int sRGB ) { struct pipe_context *pipe = This->pipe; + struct pipe_screen *screen = pipe->screen; struct pipe_resource *resource = This->base.resource; struct pipe_surface templ; + enum pipe_format srgb_format; assert(This->desc.Pool == D3DPOOL_DEFAULT || This->desc.Pool == D3DPOOL_MANAGED); assert(resource); - templ.format = sRGB ? util_format_srgb(resource->format) : resource->format; + srgb_format = util_format_srgb(resource->format); + if (sRGB && srgb_format != PIPE_FORMAT_NONE && + screen->is_format_supported(screen, srgb_format, + resource->target, 0, resource->bind)) + templ.format = srgb_format; + else + templ.format = resource->format; templ.u.tex.level = This->level; templ.u.tex.first_layer = This->layer; templ.u.tex.last_layer = This->layer; |