fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 07:28:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

mesa: add glRenderbufferStorage support for EXT_texture_norm16 formats

Browse source 
These bits were missing, found when extending the Piglit test.

Fixes: 7f467d4f73 "mesa: GL_EXT_texture_norm16 extension plumbing"
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Nanley Chery <nanley.g.chery@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
This commit is contained in:
Tapani Pälli 2018-07-24 08:58:20 +03:00
parent f94681b6e2
commit ce80abbb17
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/mesa/main/fbobject.c
View file

@ -1943,8 +1943,10 @@ _mesa_base_fbo_format(const struct gl_context *ctx, GLenum internalFormat)
case GL_RGBA:
case GL_RGBA2:
case GL_RGBA12:
case GL_RGBA16:
return _mesa_is_desktop_gl(ctx) ? GL_RGBA : 0;
case GL_RGBA16:
return _mesa_is_desktop_gl(ctx) || _mesa_has_EXT_texture_norm16(ctx)
? GL_RGBA : 0;
case GL_RGB10_A2:
case GL_SRGB8_ALPHA8_EXT:
return _mesa_is_desktop_gl(ctx) || _mesa_is_gles3(ctx) ? GL_RGBA : 0;
@ -1979,15 +1981,17 @@ _mesa_base_fbo_format(const struct gl_context *ctx, GLenum internalFormat)
ctx->Extensions.ARB_depth_buffer_float)
? GL_DEPTH_STENCIL : 0;
case GL_RED:
return _mesa_has_ARB_texture_rg(ctx) ? GL_RED : 0;
case GL_R16:
return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_rg
return _mesa_has_ARB_texture_rg(ctx) || _mesa_has_EXT_texture_norm16(ctx)
? GL_RED : 0;
case GL_R8:
return ctx->API != API_OPENGLES && ctx->Extensions.ARB_texture_rg
? GL_RED : 0;
case GL_RG:
return _mesa_has_ARB_texture_rg(ctx) ? GL_RG : 0;
case GL_RG16:
return _mesa_is_desktop_gl(ctx) && ctx->Extensions.ARB_texture_rg
return _mesa_has_ARB_texture_rg(ctx) || _mesa_has_EXT_texture_norm16(ctx)
? GL_RG : 0;
case GL_RG8:
return ctx->API != API_OPENGLES && ctx->Extensions.ARB_texture_rg