Timo Aaltonen pushed to branch upstream-unstable at X Strike Force / lib / mesa
Commits: 330d31f6 by Lionel Landwerlin at 2019-11-13T18:34:47Z mesa: check framebuffer completeness only after state update The change made in 88d665830f27 ("mesa: check draw buffer completeness on glClearBufferfi/glClearBufferiv") correctly updated the state prior to checking the framebuffer completeness on glClearBufferiv but not in glClearBufferfi. Signed-off-by: Lionel Landwerlin <[email protected]> Reviewed-by: Anuj Phogat <[email protected]> Fixes: 88d665830f27 ("mesa: check draw buffer completeness on glClearBufferfi/glClearBufferiv") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2072 (cherry picked from commit f93bb903020bac21a36e240b2c19a4733c2405ee) - - - - - cebe2b12 by Dylan Baker at 2019-11-13T18:38:40Z docs: Add release notes for 19.2.4 - - - - - 6f1b8e55 by Dylan Baker at 2019-11-13T18:38:55Z VERSION: bump to 19.2.4 - - - - - 3 changed files: - VERSION - + docs/relnotes/19.2.4.html - src/mesa/main/clear.c Changes: ===================================== VERSION ===================================== @@ -1 +1 @@ -19.2.3 +19.2.4 ===================================== docs/relnotes/19.2.4.html ===================================== @@ -0,0 +1,65 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";> +<html lang="en"> +<head> +<meta http-equiv="content-type" content="text/html; charset=utf-8"> +<title>Mesa Release Notes</title> +<link rel="stylesheet" type="text/css" href="../mesa.css"> +</head> +<body> + +<div class="header"> +<h1>The Mesa 3D Graphics Library</h1> +</div> + +<iframe src="../contents.html"></iframe> +<div class="content"> + +<h1>Mesa 19.2.4 Release Notes / 2019-11-13</h1> + +<p> + Mesa 19.2.4 is an emergency bug fix release to fix on ciritcal bug in 19.2.3. +</p> +<p> +Mesa 19.2.4 implements the OpenGL 4.5 API, but the version reported by +glGetString(GL_VERSION) or glGetIntegerv(GL_MAJOR_VERSION) / +glGetIntegerv(GL_MINOR_VERSION) depends on the particular driver being used. +Some drivers don't support all the features required in OpenGL 4.5. OpenGL +4.5 is <strong>only</strong> available if requested at context creation. +Compatibility contexts may report a lower version depending on each driver. +</p> +<p> +Mesa 19.2.4 implements the Vulkan 1.1 API, but the version reported by +the apiVersion property of the VkPhysicalDeviceProperties struct +depends on the particular driver being used. +</p> + +<h2>SHA256 checksum</h2> +<pre> +TBD. +</pre> + + +<h2>New features</h2> + +<ul> + <li>None</li> +</ul> + +<h2>Bug fixes</h2> + +<ul> + <li>Dirt Rally: Menu system doesn't show up with Mesa 19.2.3</li> +</ul> + +<h2>Changes</h2> + +<ul> + <p>Lionel Landwerlin (1):</p> + <li> mesa: check framebuffer completeness only after state update</li> + <p></p> + <p></p> +</ul> + +</div> +</body> +</html> ===================================== src/mesa/main/clear.c ===================================== @@ -692,12 +692,6 @@ clear_bufferfi(struct gl_context *ctx, GLenum buffer, GLint drawbuffer, drawbuffer); return; } - - if (ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) { - _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT, - "glClearBufferfi(incomplete framebuffer)"); - return; - } } if (ctx->RasterDiscard) @@ -707,6 +701,12 @@ clear_bufferfi(struct gl_context *ctx, GLenum buffer, GLint drawbuffer, _mesa_update_state( ctx ); } + if (!no_error && ctx->DrawBuffer->_Status != GL_FRAMEBUFFER_COMPLETE_EXT) { + _mesa_error(ctx, GL_INVALID_FRAMEBUFFER_OPERATION_EXT, + "glClearBufferfi(incomplete framebuffer)"); + return; + } + if (ctx->DrawBuffer->Attachment[BUFFER_DEPTH].Renderbuffer) mask |= BUFFER_BIT_DEPTH; if (ctx->DrawBuffer->Attachment[BUFFER_STENCIL].Renderbuffer) View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/019dbc4b3b4d3758d978d81f0c2b9f299fa2e47e...6f1b8e554fb558e2e6a03285219771dbfd290227 -- View it on GitLab: https://salsa.debian.org/xorg-team/lib/mesa/compare/019dbc4b3b4d3758d978d81f0c2b9f299fa2e47e...6f1b8e554fb558e2e6a03285219771dbfd290227 You're receiving this email because of your account on salsa.debian.org.
