diff options
| author | Ilia Mirkin <[email protected]> | 2014-05-03 05:08:53 -0400 |
|---|---|---|
| committer | Ilia Mirkin <[email protected]> | 2014-05-04 20:10:14 -0400 |
| commit | 833f870d9b9f437293fc7ee7fdf4dd428eb5db70 (patch) | |
| tree | 7c32a3b4bbf9968f1fbd746f85f7426ab8e06cdd | |
| parent | cee22a0b48a3d52996d8a660ad1918b325f4a24e (diff) | |
mesa/st: implement ARB_stencil_texturing
If StencilSampling is enabled on the texture object, pass in an
equivalent stencil-only format.
Signed-off-by: Ilia Mirkin <[email protected]>
Reviewed-by: Marek Olšák <[email protected]>
| -rw-r--r-- | src/mesa/state_tracker/st_atom_texture.c | 4 | ||||
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/mesa/state_tracker/st_atom_texture.c b/src/mesa/state_tracker/st_atom_texture.c index afc6d9dab7e..928a4ffd2a3 100644 --- a/src/mesa/state_tracker/st_atom_texture.c +++ b/src/mesa/state_tracker/st_atom_texture.c @@ -271,6 +271,10 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, sv = st_texture_get_sampler_view(st, stObj); + if (stObj->base.StencilSampling && + util_format_is_depth_and_stencil(format)) + format = util_format_stencil_only(format); + /* if sampler view has changed dereference it */ if (*sv) { if (check_sampler_swizzle(stObj, *sv) || diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 33cd1295bfd..12ba82df342 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -507,6 +507,11 @@ void st_init_extensions(struct st_context *st) { { o(OES_compressed_ETC1_RGB8_texture) }, { PIPE_FORMAT_ETC1_RGB8 } }, + + { { o(ARB_stencil_texturing) }, + { PIPE_FORMAT_X24S8_UINT, + PIPE_FORMAT_S8X24_UINT }, + GL_TRUE }, /* at least one format must be supported */ }; /* Required: vertex fetch support. */ |