On Thursday, April 26, 2018 11:52:33 PM PDT Tapani Pälli wrote: > Earlier plumbing missed interaction with texture buffer objects. > > Fixes: 7f467d4f73 "mesa: GL_EXT_texture_norm16 extension plumbing" > Signed-off-by: Tapani Pälli <tapani.pa...@intel.com> > --- > 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 5284e60b20..f6bfca65ed 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: >
Reviewed-by: Kenneth Graunke <kenn...@whitecape.org>
signature.asc
Description: This is a digitally signed message part.
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev
