From e62530a6c00da71c0f7bf1f4c425fe6c5b452df6 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Tue, 26 Apr 2011 02:28:33 +0200 Subject: [PATCH] st/mesa: support EXT_packed_float Reviewed-by: Brian Paul --- src/mesa/state_tracker/st_cb_drawpixels.c | 4 ++++ src/mesa/state_tracker/st_extensions.c | 7 +++++++ src/mesa/state_tracker/st_format.c | 11 +++++++++++ 3 files changed, 22 insertions(+) diff --git a/src/mesa/state_tracker/st_cb_drawpixels.c b/src/mesa/state_tracker/st_cb_drawpixels.c index be0cd618dd5..31360fd3c11 100644 --- a/src/mesa/state_tracker/st_cb_drawpixels.c +++ b/src/mesa/state_tracker/st_cb_drawpixels.c @@ -376,6 +376,10 @@ internal_format(struct gl_context *ctx, GLenum format, GLenum type) case GL_UNSIGNED_INT_5_9_9_9_REV: assert(ctx->Extensions.EXT_texture_shared_exponent); return GL_RGB9_E5; + + case GL_UNSIGNED_INT_10F_11F_11F_REV: + assert(ctx->Extensions.EXT_packed_float); + return GL_R11F_G11F_B10F; } } } diff --git a/src/mesa/state_tracker/st_extensions.c b/src/mesa/state_tracker/st_extensions.c index 0ad1eda63c1..a5324df5549 100644 --- a/src/mesa/state_tracker/st_extensions.c +++ b/src/mesa/state_tracker/st_extensions.c @@ -582,4 +582,11 @@ void st_init_extensions(struct st_context *st) PIPE_BIND_SAMPLER_VIEW)) { ctx->Extensions.EXT_texture_shared_exponent = GL_TRUE; } + + if (screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT, + PIPE_TEXTURE_2D, 0, + PIPE_BIND_RENDER_TARGET | + PIPE_BIND_SAMPLER_VIEW)) { + ctx->Extensions.EXT_packed_float = GL_TRUE; + } } diff --git a/src/mesa/state_tracker/st_format.c b/src/mesa/state_tracker/st_format.c index 91afab6594b..b1362108f0a 100644 --- a/src/mesa/state_tracker/st_format.c +++ b/src/mesa/state_tracker/st_format.c @@ -327,6 +327,8 @@ st_mesa_format_to_pipe_format(gl_format mesaFormat) case MESA_FORMAT_RGB9_E5_FLOAT: return PIPE_FORMAT_R9G9B9E5_FLOAT; + case MESA_FORMAT_R11_G11_B10_FLOAT: + return PIPE_FORMAT_R11G11B10_FLOAT; default: assert(0); @@ -550,6 +552,8 @@ st_pipe_format_to_mesa_format(enum pipe_format format) case PIPE_FORMAT_R9G9B9E5_FLOAT: return MESA_FORMAT_RGB9_E5_FLOAT; + case PIPE_FORMAT_R11G11B10_FLOAT: + return MESA_FORMAT_R11_G11_B10_FLOAT; default: assert(0); @@ -1496,6 +1500,13 @@ st_choose_format(struct pipe_screen *screen, GLenum internalFormat, } return PIPE_FORMAT_NONE; + case GL_R11F_G11F_B10F: + if (screen->is_format_supported(screen, PIPE_FORMAT_R11G11B10_FLOAT, target, + sample_count, bindings)) { + return PIPE_FORMAT_R11G11B10_FLOAT; + } + return PIPE_FORMAT_NONE; + default: return PIPE_FORMAT_NONE; } -- 2.11.0