fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-08 02:38:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

mesa/main: do not allow ARB_depth_buffer_float enums before gles3

Browse source 
Floating-point depth buffers are only supported on OpenGL 3.0, OpenGL ES
3.0, or if ARB_depth_buffer_float is supported. Because we checked a
driver capability rather than using an extension-check helper, we ended
up incorrectly allowing this on OpenGL ES 1.x and 2.x.

Since this logic is repeated, let's make a helper for it.

Signed-off-by: Erik Faye-Lund <erik.faye-lund@collabora.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
This commit is contained in:
Erik Faye-Lund 2018-11-15 17:02:32 +01:00
parent 3bbd543b6e
commit 83db9d3e3a
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/mesa/main/context.h
View file

@ -349,6 +349,12 @@ _mesa_has_texture_rgb10_a2ui(const struct gl_context *ctx)
return _mesa_has_ARB_texture_rgb10_a2ui(ctx) || _mesa_is_gles3(ctx);
}
static inline bool
_mesa_has_float_depth_buffer(const struct gl_context *ctx)
{
return _mesa_has_ARB_depth_buffer_float(ctx) || _mesa_is_gles3(ctx);
}
/**
* Checks if the context supports geometry shaders.
*/

6
src/mesa/main/glformats.c
View file

@ -1849,7 +1849,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
return GL_NO_ERROR;
case GL_FLOAT_32_UNSIGNED_INT_24_8_REV:
if (!ctx->Extensions.ARB_depth_buffer_float) {
if (!_mesa_has_float_depth_buffer(ctx)) {
return GL_INVALID_ENUM;
}
if (format != GL_DEPTH_STENCIL) {
@ -2048,7 +2048,7 @@ _mesa_error_check_format_and_type(const struct gl_context *ctx,
case GL_DEPTH_STENCIL:
if (type == GL_UNSIGNED_INT_24_8)
return GL_NO_ERROR;
else if (ctx->Extensions.ARB_depth_buffer_float &&
else if (_mesa_has_float_depth_buffer(ctx) &&
type == GL_FLOAT_32_UNSIGNED_INT_24_8_REV)
return GL_NO_ERROR;
else
@ -2607,7 +2607,7 @@ _mesa_base_tex_format(const struct gl_context *ctx, GLint internalFormat)
}
}
if (ctx->Extensions.ARB_depth_buffer_float) {
if (_mesa_has_float_depth_buffer(ctx)) {
switch (internalFormat) {
case GL_DEPTH_COMPONENT32F:
return GL_DEPTH_COMPONENT;