diff options
| author | Marek Olšák <[email protected]> | 2012-01-22 18:27:40 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2012-01-25 12:35:19 +0100 |
| commit | 925fd2e1ddf9fbeb1d21a9b1223fe6fc13192dc7 (patch) | |
| tree | d4be3694dea2f345f612c258d0f8f3a729cc2bdb /src | |
| parent | 95dab55751e035840cb765b32a98f4ba1ecc0212 (diff) | |
st/mesa: simplify enabling EXT_packed_depth_stencil and ARB_fbo
- use OR to combine bind flags
- combine both conditionals into one
- move the ARB_fbo enable where it belongs
Reviewed-by: Brian Paul <[email protected]>
Diffstat (limited to 'src')
| -rw-r--r-- | src/mesa/state_tracker/st_extensions.c | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 1f3b59fc67e..527e56d18bd 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -387,19 +387,14 @@ void st_init_extensions(struct st_context *st) */ if (screen->is_format_supported(screen, PIPE_FORMAT_S8_UINT_Z24_UNORM, PIPE_TEXTURE_2D, 0, - PIPE_BIND_DEPTH_STENCIL) && - screen->is_format_supported(screen, PIPE_FORMAT_S8_UINT_Z24_UNORM, + PIPE_BIND_DEPTH_STENCIL | + PIPE_BIND_SAMPLER_VIEW) || + screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_UINT, PIPE_TEXTURE_2D, 0, + PIPE_BIND_DEPTH_STENCIL | PIPE_BIND_SAMPLER_VIEW)) { ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE; - } - else if (screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_UINT, - PIPE_TEXTURE_2D, 0, - PIPE_BIND_DEPTH_STENCIL) && - screen->is_format_supported(screen, PIPE_FORMAT_Z24_UNORM_S8_UINT, - PIPE_TEXTURE_2D, 0, - PIPE_BIND_SAMPLER_VIEW)) { - ctx->Extensions.EXT_packed_depth_stencil = GL_TRUE; + ctx->Extensions.ARB_framebuffer_object = GL_TRUE; } /* float support - assume nothing exclusively supports 64-bit floats */ @@ -516,12 +511,6 @@ void st_init_extensions(struct st_context *st) ctx->Extensions.MESA_texture_array = GL_TRUE; } - /* GL_ARB_framebuffer_object */ - if (ctx->Extensions.EXT_packed_depth_stencil) { - /* we support always support GL_EXT_framebuffer_blit */ - ctx->Extensions.ARB_framebuffer_object = GL_TRUE; - } - if (screen->get_param(screen, PIPE_CAP_CONDITIONAL_RENDER)) { ctx->Extensions.NV_conditional_render = GL_TRUE; } |