Revert "mesa: allow half float textures based on ARB_half_float_pixel"
This reverts commitaca67a555c
, which regressed the following Piglit test on i915 (and presumably r200): piglit/spec/!opengl 1.1/sized-texture-format-channels Specifically, it begins testing glTexImage2D with format GL_RGBA, type GL_FLOAT, and internalFormat GL_RGB16F, which leads to the following error: Mesa 21.0.0-devel implementation error: unexpected format GL_RGB16F in _mesa_choose_tex_format() Please report at https://gitlab.freedesktop.org/mesa/mesa/-/issues sized-texture-format-channels: ../../src/mesa/main/teximage.c:2836: _mesa_choose_texture_format: Assertion `f != MESA_FORMAT_NONE' failed. i915 and r200 unconditionally support ARB_half_float_pixel, but neither support RGB16F as an internal format. According to Ian's rationale in the commit message for1edca151a0
(which enabled that extension for all drivers): "This extension only adds data types that can be passed to, for example, glTexImage2D. It does not add internal formats. Since you can already pass GL_FLOAT to glTexImage2D this shouldn't pose any additional issues with those drivers. Note that r200 and i915 already supported this extension, and they don't support floating-point textures either." So, commit aca67a55c011 enabled half-float internal formats on hardware that cannot support them. We should revert the change. v2: Don't reintroduce the _mesa_is_gles3() condition, as that shouldn't be necessary (feedback from Erik Faye-Lund). Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Reviewed-by: Erico Nunes <nunes.erico@gmail.com> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8458>
This commit is contained in:
parent
9fb5d7acbb
commit
07473321a2
|
@ -356,7 +356,6 @@ static inline bool
|
|||
_mesa_has_half_float_textures(const struct gl_context *ctx)
|
||||
{
|
||||
return _mesa_has_ARB_texture_float(ctx) ||
|
||||
_mesa_has_ARB_half_float_pixel(ctx) ||
|
||||
_mesa_has_OES_texture_half_float(ctx);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue