fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 13:50:11 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'gles2-half-float-fbo-fix' into 'main'

Browse source 
mesa/main: Reject unsized RGB half-float textures as framebuffer attachments in GLES2

See merge request mesa/mesa!38464
This commit is contained in:
Christian Gmeiner 2025-12-20 01:49:03 +01:00
commit bb3d9f0d7d
14 changed files with 23 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/etnaviv/ci/etnaviv-gc3000-r5450-fails.txt
View file

@ -4,7 +4,6 @@ dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.depth.r16f,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.depth.rg16f,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.stencil.r16f,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.renderbuffer.stencil.rg16f,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.shaders.invariance.highp.loop_2,Fail
dEQP-GLES2.functional.shaders.invariance.highp.subexpression_precision_lowp,Fail
dEQP-GLES2.functional.shaders.invariance.lowp.loop_2,Fail

1
src/etnaviv/ci/etnaviv-gc7000-r6204-fails.txt
View file

@ -1,4 +1,3 @@
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.shaders.operator.selection.highp_float_fragment,Fail
dEQP-GLES2.functional.shaders.operator.selection.highp_int_fragment,Fail
dEQP-GLES2.functional.shaders.operator.selection.highp_ivec2_fragment,Fail

1
src/etnaviv/ci/etnaviv-gc7000-r6214-fails.txt
View file

@ -1,4 +1,3 @@
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.rasterization.primitives.lines_wide,Fail
dEQP-GLES2.functional.shaders.operator.selection.highp_float_fragment,Fail
dEQP-GLES2.functional.shaders.operator.selection.highp_int_fragment,Fail

3
src/gallium/drivers/crocus/ci/crocus-g41-fails.txt
View file

@ -20,9 +20,6 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_x_pos_z_and_neg_x_neg_y_neg_z,Fail
dEQP-GLES2.functional.clipping.triangle_vertex.clip_two.clip_neg_y_neg_z_and_neg_x_neg_y_pos_z,Fail
# RGB/RGBA half float should be incomplete, tested as complete.
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.shaders.texture_functions.vertex.texturecubelod,Fail
# Subpixel precision errors

2
src/gallium/drivers/r300/ci/r300-rs740-fails.txt
View file

@ -32,8 +32,6 @@ dEQP-GLES2.functional.draw.random.70,Fail
dEQP-GLES2.functional.draw.random.71,Fail
dEQP-GLES2.functional.draw.random.8,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail

1
src/gallium/drivers/r300/ci/r300-rv380-fails.txt
View file

@ -3,7 +3,6 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail

1
src/gallium/drivers/r300/ci/r300-rv410-fails.txt
View file

@ -3,7 +3,6 @@ dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail

4
src/gallium/drivers/r300/ci/r300-rv530-nohiz-fails.txt
View file

@ -5,10 +5,6 @@ dEQP-GLES2.functional.clipping.point.wide_point_clip_viewport_corner,Fail
dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_center,Fail
dEQP-GLES2.functional.clipping.line.wide_line_clip_viewport_corner,Fail
# "Framebuffer checked as complete, expected incomplete"
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgb,Fail
dEQP-GLES2.functional.fbo.render.repeated_clear.tex2d_rgba,Fail

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

@ -915,14 +915,24 @@ gles_check_float_renderable(const struct gl_context *ctx,
if (!att->Texture || !is_float_format(att->Renderbuffer->InternalFormat))
return true;
/* GL_RGBA with unsized GL_FLOAT type, no extension can make this
* color renderable.
/* We don't support any extension that makes unsized GL_RGB with float
* or half-float color-renderable.
*/
if (att->Texture->_IsFloat && att->Renderbuffer->_BaseFormat == GL_RGBA)
if (att->Texture->_FloatType && att->Renderbuffer->_BaseFormat == GL_RGB)
return false;
/* Unsized GL_HALF_FLOAT supported only with EXT_color_buffer_half_float. */
if (att->Texture->_IsHalfFloat && !_mesa_has_EXT_color_buffer_half_float(ctx))
/* Unsized GL_FLOAT is never color-renderable (EXT_color_buffer_float
* only covers sized formats).
*/
if (att->Texture->_FloatType == GL_FLOAT)
return false;
/* Unsized GL_HALF_FLOAT (non-OES) is never color-renderable. */
if (att->Texture->_FloatType == GL_HALF_FLOAT)
return false;
/* Unsized GL_HALF_FLOAT_OES supported only with EXT_color_buffer_half_float. */
if (att->Texture->_FloatType == GL_HALF_FLOAT_OES && !_mesa_has_EXT_color_buffer_half_float(ctx))
return false;
const struct gl_texture_object *texObj = att->Texture;

3
src/mesa/main/mtypes.h
View file

@ -932,8 +932,7 @@ struct gl_texture_object
GLboolean _IsIntegerFormat; /**< Does the texture store integer values? */
GLboolean _RenderToTexture; /**< Any rendering to this texture? */
GLboolean Immutable; /**< GL_ARB_texture_storage */
GLboolean _IsFloat; /**< GL_OES_float_texture */
GLboolean _IsHalfFloat; /**< GL_OES_half_float_texture */
GLenum16 _FloatType; /**< GL_FLOAT, GL_HALF_FLOAT, GL_HALF_FLOAT_OES, or 0 */
bool HandleAllocated; /**< GL_ARB_bindless_texture */
bool DeletePending; /**< true if texture object is removed from the hash */

7
src/mesa/main/teximage.c
View file

@ -3197,11 +3197,8 @@ teximage(struct gl_context *ctx, GLboolean compressed, GLuint dims,
* internal floating point format for the given base format.
*/
if (_mesa_is_gles(ctx) && format == internalFormat) {
if (type == GL_FLOAT) {
texObj->_IsFloat = GL_TRUE;
} else if (type == GL_HALF_FLOAT_OES || type == GL_HALF_FLOAT) {
texObj->_IsHalfFloat = GL_TRUE;
}
if (type == GL_FLOAT || type == GL_HALF_FLOAT || type == GL_HALF_FLOAT_OES)
texObj->_FloatType = type;
internalFormat = adjust_for_oes_float_texture(ctx, format, type);
}

8
src/mesa/main/texobj.c
View file

@ -76,9 +76,9 @@ valid_filter_for_float(const struct gl_context *ctx,
{
switch (obj->Sampler.Attrib.MagFilter) {
case GL_LINEAR:
if (obj->_IsHalfFloat && !ctx->Extensions.OES_texture_half_float_linear) {
if (obj->_FloatType == GL_HALF_FLOAT_OES && !ctx->Extensions.OES_texture_half_float_linear) {
return false;
} else if (obj->_IsFloat && !ctx->Extensions.OES_texture_float_linear) {
} else if (obj->_FloatType == GL_FLOAT && !ctx->Extensions.OES_texture_float_linear) {
return false;
}
FALLTHROUGH;
@ -94,9 +94,9 @@ valid_filter_for_float(const struct gl_context *ctx,
case GL_NEAREST_MIPMAP_LINEAR:
case GL_LINEAR_MIPMAP_NEAREST:
case GL_LINEAR_MIPMAP_LINEAR:
if (obj->_IsHalfFloat && !ctx->Extensions.OES_texture_half_float_linear) {
if (obj->_FloatType == GL_HALF_FLOAT_OES && !ctx->Extensions.OES_texture_half_float_linear) {
return false;
} else if (obj->_IsFloat && !ctx->Extensions.OES_texture_float_linear) {
} else if (obj->_FloatType == GL_FLOAT && !ctx->Extensions.OES_texture_float_linear) {
return false;
}
FALLTHROUGH;

2
src/mesa/state_tracker/st_atom_sampler.c
View file

@ -71,7 +71,7 @@ st_convert_sampler(const struct st_context *st,
sampler->seamless_cube_map |= seamless_cube_map;
if (texobj->_IsIntegerFormat ||
(texobj->_IsFloat && st->ctx->Const.ForceFloat32TexNearest)) {
(texobj->_FloatType == GL_FLOAT && st->ctx->Const.ForceFloat32TexNearest)) {
sampler->min_img_filter = PIPE_TEX_FILTER_NEAREST;
sampler->min_mip_filter = PIPE_TEX_FILTER_NEAREST;
sampler->mag_img_filter = PIPE_TEX_FILTER_NEAREST;

1
src/panfrost/ci/panfrost-t720-fails.txt
View file

@ -18,7 +18,6 @@ dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.62,Fail
dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.73,Fail
dEQP-GLES2.functional.fragment_ops.interaction.basic_shader.81,Fail
dEQP-GLES2.functional.fragment_ops.random.43,Fail
dEQP-GLES2.functional.fbo.completeness.renderable.texture.color0.rgb_half_float_oes,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_clamp,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_mirror,Fail
dEQP-GLES2.functional.texture.vertex.cube.filtering.nearest_mipmap_linear_linear_repeat,Fail