From b3ad4b69715cccff3212dc5a2b4d73b13da4bb1c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Fri, 27 Apr 2018 09:52:33 +0300 Subject: [PATCH] mesa: add TBO support for GL_EXT_texture_norm16 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Earlier plumbing missed interaction with texture buffer objects. Fixes: 7f467d4f73 "mesa: GL_EXT_texture_norm16 extension plumbing" Signed-off-by: Tapani Pälli Reviewed-by: Kenneth Graunke --- src/mesa/main/teximage.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/mesa/main/teximage.c b/src/mesa/main/teximage.c index 5284e60b202..f6bfca65ed9 100644 --- a/src/mesa/main/teximage.c +++ b/src/mesa/main/teximage.c @@ -5345,7 +5345,7 @@ _mesa_get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat) case GL_RGBA8: return MESA_FORMAT_R8G8B8A8_UNORM; case GL_RGBA16: - if (_mesa_is_gles(ctx)) + if (_mesa_is_gles(ctx) && !_mesa_has_EXT_texture_norm16(ctx)) return MESA_FORMAT_NONE; return MESA_FORMAT_RGBA_UNORM16; case GL_RGBA16F_ARB: @@ -5368,7 +5368,7 @@ _mesa_get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat) case GL_RG8: return MESA_FORMAT_R8G8_UNORM; case GL_RG16: - if (_mesa_is_gles(ctx)) + if (_mesa_is_gles(ctx) && !_mesa_has_EXT_texture_norm16(ctx)) return MESA_FORMAT_NONE; return MESA_FORMAT_R16G16_UNORM; case GL_RG16F: @@ -5391,7 +5391,7 @@ _mesa_get_texbuffer_format(const struct gl_context *ctx, GLenum internalFormat) case GL_R8: return MESA_FORMAT_R_UNORM8; case GL_R16: - if (_mesa_is_gles(ctx)) + if (_mesa_is_gles(ctx) && !_mesa_has_EXT_texture_norm16(ctx)) return MESA_FORMAT_NONE; return MESA_FORMAT_R_UNORM16; case GL_R16F: -- 2.30.2