From bb8285c25859b35d06ccd283d7fdf1bab07dc059 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Alejandro=20Pi=C3=B1eiro?= Date: Thu, 26 Aug 2021 02:01:28 +0200 Subject: [PATCH] v3d: add support for no buffer object bound MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit From the GL_OES_texture_buffer spec: "If no buffer object is bound to the buffer texture, the results of the texel access are undefined." this can be interpreted as allowing any result to come back, but not terminate the program. The current solution is not entirely complete, as it could still try to get a wrong address for the shader state address. This can be checked with piglit test arb_texture_buffer_object-render-no-bo; the test is skip because it requires OpenGL 3.1, but if overriding the version then it will crash. Signed-off-by: Alejandro Piñeiro Reviewed-by: Iago Toral Quiroga Part-of: --- src/gallium/drivers/v3d/v3d_uniforms.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/gallium/drivers/v3d/v3d_uniforms.c b/src/gallium/drivers/v3d/v3d_uniforms.c index 4bcf92c..d316195 100644 --- a/src/gallium/drivers/v3d/v3d_uniforms.c +++ b/src/gallium/drivers/v3d/v3d_uniforms.c @@ -172,6 +172,20 @@ write_tmu_p0(struct v3d_job *job, int unit = v3d_unit_data_get_unit(data); struct pipe_sampler_view *psview = texstate->textures[unit]; struct v3d_sampler_view *sview = v3d_sampler_view(psview); + /* GL_OES_texture_buffer spec: + * "If no buffer object is bound to the buffer texture, the + * results of the texel access are undefined." + * + * This can be interpreted as allowing any result to come back, but + * not terminate the program (and some tests interpret that). + * + * FIXME: just return is not a full valid solution, as it could still + * try to get a wrong address for the shader state address. Perhaps we + * would need to set up a BO with a "default texture state" + */ + if (sview == NULL) + return; + struct v3d_resource *rsc = v3d_resource(sview->texture); cl_aligned_reloc(&job->indirect, uniforms, sview->bo, -- 2.7.4